Checkout Tools
  • last updated 4 hours ago
Constraints: committers
Constraints: files
Constraints: dates

Changeset 880510 is being indexed.

Some more doxygen improvements.

* subversion/include/svn_editor.h,


Explicitly link various doxygen entities.

* subversion/libsvn_wc/update_editor.c

(apply_textdelta): Remove some unneeded braces, and wrap an error return.

Fix a bug when editing multi-line property values in Emacs 22 or above, where

dsvn used to add empty lines at the end of existing values. This was caused

by a change in behaviour of split-string in Emacs 22.

* contrib/client-side/emacs/dsvn.el:

(svn-propedit): Replace call to split-string with our own code.

A minor revision to the pre-obliterate hook design.

* notes/obliterate/design-authz.html

Specify that each path to be obliterated has a revision range rather than

just a single revision, because in some use cases the revision range will

be very large.

Followup to r40378 by fulfilling the API promise to close the underlying

streams upon the tee'd stream closure.

Suggested by rhuijben

* subversion/libsvn_subr/stream.c

(close_handler_tee): New.

(svn_stream_tee): Set the close handler.

[Revert r40417 and r40409 on subversion/libsvn_subr/debug.c]

These functions are part of the public API as defined in the .def file

(which is generated via and is not different between

release and debug builds).

* subversion/libsvn_subr/debug.c

Unconditionally define functions.

* subversion/libsvn_wc/update_editor.c (get_node_uri): Change declaration

order to comply with C90.

* In maintainer mode, warn about declarations that

come after statements. This is a follow-up to r40428.

* www/hacking.html: Stress that we use C90 for compatibility, not C99.


* subversion/libsvn_wc/update_editor.c

(check_tree_conflict): Typo in comment.

* subversion/libsvn_wc/wc_db.h

(svn_wc__db_scan_base_repos): Typo in comment.

* subversion/tests/cmdline/ Add whitespace.

On the 'python-3-compatibility' branch:

Merge r40069:40425 from trunk.

  1. … 242 more files in changeset.
* notes/tree-conflicts/ Update list of tree-conflicts tests.

wc-ng: Remove use of svn_wc_entry_t from tree-conflict detection during update.

Keep the outcome identical, avoid fixing.

Changes in behavior are pending and discussed on dev@:

Subject: Re: wc-ng patch review

Date: Fri, 06 Nov 2009 11:43:05 +0000

Message-ID: <>

* subversion/libsvn_wc/update_editor.c

(SVN_WC_CONFLICT_REASON_NONE): New local #define.

(get_node_working_state, get_node_uri):

New static functions, for check_tree_conflict().

(check_tree_conflict): Replace svn_wc_entry_t use with calls to the WC DB

via the new helper functions. Remove obsolete check for duplicate tree

conflict involving an add of a file external (cannot reproduce).

Revert wrong changes committed in r40417 and r40418. Also revert r40419.

* subversion/libsvn_subr/dso.c

(svn_dso_load): Use fprintf() instead of SVN_DBG() to print error message.

* tools/server-side/svn-rep-sharing-stats.c


"To iterpool, or not to iterpool" is left as an open question.

svn-rep-sharing-stats: print progress reports to stderr (instead of stdout)

and add a '--quiet' switch to suppress them altogether. Follow-up to r40410.

* tools/server-side/svn-rep-sharing-stats.c


Print to stderr, not stdout. Add 'quiet' parameter and use it.


Add 'quiet' parameter and pass it to process_one_revision().


Add '--quiet' option and pass it to process().

Follow-up to r40417:

Fix building of SWIG Perl bindings.

* Define SWIG_PL_CPPFLAGS and mark it for substitution.

* subversion/bindings/swig/perl/native/ Set $cppflags to value

of @SWIG_PL_CPPFLAGS@ instead of @CPPFLAGS@.

Attempt to fix building on Windows.

* build/generator/

(_filter_names): Add svn_dbg__preamble and svn_dbg__printf.

[portions of this change were reverted in: 40423, 40431, 40444]

Fix inclusion of svn_debug.h. Previously this private header was included from

public header (svn_types.h) when SVN_DEBUG was defined. It was causing build

failures when including installed svn_types.h with SVN_DEBUG defined. Now

svn_debug.h is automatically included when SVN_DEBUG is defined during building

of Subversion, but isn't included from installed svn_types.h when SVN_DEBUG is


* Include subversion/include/private/svn_debug.h in debug mode.

* subversion/include/svn_types.h: Don't include "private/svn_debug.h" when

SVN_DEBUG is defined.

* subversion/include/private/svn_debug.h: Include <stdio.h> and don't include

"svn_types.h". Don't allow to use this header when SVN_DEBUG isn't defined.

* subversion/libsvn_subr/debug.c: Include some headers only when SVN_DEBUG is


* subversion/libsvn_subr/sqlite.c: Don't include "private/svn_debug.h" when

SQLITE3_DEBUG is defined. Don't allow to use SQLITE3_DEBUG when SVN_DEBUG

isn't defined.

* subversion/libsvn_client/merge.c:

* subversion/libsvn_wc/adm_crawler.c:

* subversion/libsvn_wc/entries.c:

* subversion/libsvn_wc/lock.c:

* subversion/libsvn_wc/node.c:

* subversion/libsvn_wc/props.c:

* subversion/libsvn_wc/status.c:

* subversion/libsvn_wc/update_editor.c: Don't include "private/svn_debug.h".

* subversion/libsvn_client/patch.c

(match_hunk): Plug two potential error leaks.

(apply_one_patch): Fix typo in comment.

Remove use of the deprecated svn_path_canonicalize() API.

* subversion/libsvn_client/repos_diff.c

(make_dir_baton, make_file_baton, delete_entry): Replace

svn_path_join() with svn_dirent_join(). An eb->target WC directory

is the "base" parameter for each call.

Patch by: Daniel Näslund <daniel{_AT_}>

Make 'svn patch' print a conflict summary when done with patching.

* subversion/svn/patch-cmd.c

(svn_cl__patch): After patching, print conflict stats if not in quiet mode.

* subversion/tests/cmdline/

(patch_unidiff_absolute_paths): Adjust expected output.

* subversion/libsvn_subr/sqlite.c: Include "private/svn_debug.h" when

SQLITE3_DEBUG is defined.

Follow-up to r40403:

Make 'svn patch' ignore all lines within hunks that start with a backslash.

They can all be considered comments, with possibly arbitrary content

following the backslash.

* subversion/libsvn_diff/parse-diff.c


modified_line_filter): Filter any lines starting with a backslash.

(parse_next_hunk): Skip lines starting with a backslash.

Suggested by: arfrever



* svn-rep-sharing-stats.c

(usage): Do not exit(), because all callers return immediately.

This fixes an 'unreachable code' warning.

svn-rep-sharing-stats: do not use SVN_DBG() for progress reports. This fixes

the build with -DSVN_DEBUG not present.

Found by: arfrever

* tools/server-side/svn-rep-sharing-stats.c

(process_one_revision): s/SVN_DBG/svn_cmdline_printf/.

* subversion/libsvn_subr/debug.c

(debug_output, quiet_mode, svn_dbg__preamble, svn_dbg__printf): Define only

when SVN_DEBUG is defined.

Fix compiler warnings:

tools/server-side/svn-rep-sharing-stats.c:127: warning: function declaration isn’t a prototype

tools/server-side/svn-rep-sharing-stats.c: In function ‘set_up_cancellation’:

tools/server-side/svn-rep-sharing-stats.c:127: warning: old-style function definition

tools/server-side/svn-rep-sharing-stats.c: In function ‘record’:

tools/server-side/svn-rep-sharing-stats.c:213: warning: suggest parentheses around assignment used as truth value

* tools/server-side/svn-rep-sharing-stats.c

(set_up_cancellation): Fix declaration.

(record): Add parentheses.

* subversion/libsvn_diff/diff_file.c

(output_unified_line): Mark a message for translation.