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

Changeset 873184 is being indexed.

Disable deprecation warnings during compilation of tests.

* subversion/tests/svn_test.h

  (SVN_DEPRECATED): Define as empty definition when


* subversion/tests/libsvn_delta/random-test.c:

* subversion/tests/libsvn_delta/svndiff-test.c:

* subversion/tests/libsvn_delta/vdelta-test.c:

* subversion/tests/libsvn_diff/diff-diff3-test.c:

* subversion/tests/libsvn_fs_base/changes-test.c:

* subversion/tests/libsvn_fs_base/fs-base-test.c:

* subversion/tests/libsvn_fs/fs-test.c:

* subversion/tests/libsvn_fs/locks-test.c:

* subversion/tests/libsvn_repos/repos-test.c:

* subversion/tests/libsvn_subr/hashdump-test.c:

* subversion/tests/libsvn_subr/opt-test.c:

* subversion/tests/libsvn_subr/string-test.c:

* subversion/tests/libsvn_subr/translate-test.c:

* subversion/tests/svn_test_fs.c: Include svn_test.h before other Subversion


Suggested by: hwright

* subversion/libsvn_client/merge.c

(get_mergeinfo_walk_cb): When creating a URL, remember to URI-encode it.

Also, don't side-effect merge_src_child_path->data.

Patch by: Matthew Inger <>

(He found where to uri-escape; I just made the no-side-effect tweak.)

See here for details:

From: "Matthew Inger" <>

To: "Karl Fogel" <>,

Subject: Re: Issue with merging files containing spaces

Date: Tue, 2 Sep 2008 17:15:10 -0400

Message-ID: <>

Remove the svn_stringbuf_appendchar function introduced in r33104.

The idiom 'svn_stringbuf_appendbytes(targetstr, &c, 1);' can be used instead.

No functional change.

* subversion/libsvn_subr/svn_string.c,


(svn_stringbuf_appendchar): Remove.

* subversion/libsvn_wc/tree_conflicts.c

(field_separator, desc_separator, escape_char): New constants

with file-scope which equal SVN_WC__TREE_CONFLICT_DESC_FIELD_SEPARATOR,



(read_victim_path, read_node_kind, read_operation, read_action,

read_reason, read_one_tree_conflict): Use constants instead

of macros for better readability (shorter names).

(svn_wc__write_tree_conflicts_to_entry): As previous, and also

use svn_stringbuf_appendbytes instead of svn_stringbuf_appendchar,

which was removed.

* subversion/libsvn_subr/svn_string.c

(svn_stringbuf_appendchar): Simplify. No functional change.

Suggested by: gstein

* subversion/include/svn_string.h:

Coding style consistency fix: move the function's return type onto a

separate line.

Add SQLite to the config/build process. It is (currently) an optional

dependency and not (yet) used by any libraries.

This reverts parts of r29036 and r29047.


(SVN_SQLITE_LIBS): new symbol to hold configure'd location of SQLite libs

(INCLUDES): add SQLite headers to the includes

* build.conf:

(sqlite): define new library as an external library

* build/win32/

(_disttree): add optional distro files for SQLite

* build/generator/

(GeneratorBase.parse_options): initialize .sqlite_path

(WinGeneratorBase.__init__): commented-out check for SQLite validity

(WinGeneratorBase.get_win_includes): add sqlite

(WinGeneratorBase.get_win_lib_dirs): add sqlite

(WinGeneratorBase.get_win_libs): add sqlite

* add section to locate SQLite

* add --with-sqlite switch (for Windows)

* aclocal.m4: include new sqlite.m4, and order includes alphabetically

* build/ac-macros/sqlite.m4: new M4 file to locate SQLite

Promote a static function from libsvn_wc/tree_conflicts.c

to a public API function. It seems to be generally useful,

and people won't look for it in libsvn_wc/tree_conflicts.c.

* subversion/include/svn_string.h,


(svn_stringbuf_appendchar): New function, moved here from ...

* subversion/libsvn_wc/tree_conflicts.c

(stringbuf_appendchar): ... here.

(svn_wc__write_tree_conflicts_to_entry): Track function rename.

Nit: tighten scope of local variable.

* subversion/libsvn_wc/status.c:

(close_edit): move tgt_access into a narrower scope.

Minor tweak to fix potential preprocessor-induced bugs.

* subversion/include/svn_wc.h:

(SVN_WC_ENTRY_WORKING_SIZE_UNKNOWN): add parens to the value

* subversion/include/svn_ra.h

(svn_ra_replay_range): Fix a typo in 'revfinish_func'.

On the file externals branch.

* branches/file-externals:

Follow up to r33098 and resolve the conflicts.

* subversion/svn/main.c

(main): Disallow simultaneous use of --with-revprop and

--with-no-revprops, as should have done in r33086.

Patch by: danielsh

On the file externals branch.

* branches/file-externals:

Merge r33083 through r33097 from trunk not resolving conflicts.

  1. … 16 more files in changeset.
Document the addition of tree conflict data to the "entries" file format.

* subversion/libsvn_wc/README

Document the new "tree-conflicts" field.

* subversion/libsvn_wc/wc.h

Document that the new "tree-conflicts" field will be included in the next

format number bump.

On the file externals branch.

* branches/file-externals:

Follow up to r33095 and resolve the conflicts.

On the file externals branch.

* branches/file-externals:

Merge r33082 from trunk, which is the tree conflicts work. No

conficts are resolved, that'll be in a successive commit.

    • ?
  1. … 38 more files in changeset.
* COMMITTERS: Adding myself (neels).

Improve a doc string.

* subversion/tests/cmdline/svntest/

(build_greek_tree_conflicts): Document what conflicts it sets up.

Properly escape regular expressions in merge tests.

* subversion/tests/cmdline/

(svn_merge): Escape the path string when using it as part

of a regular expression.

Properly escape regular expressions in tree-conflict tests. They were failing

on Windows with paths with backslashes in them.

* subversion/tests/cmdline/

(ensure_tree_conflict): Escape the path string when embedding it in a

regular expression.

Fix a set of tests that were failing on Windows. A follow-up to r33082.

* subversion/tests/cmdline/

(ensure_status_c_on_parent): Escape the path string when using it as part

of a regular expression.

Fix a failing test by modifying it to expect the current tree-conflict


* subversion/tests/cmdline/

(mergeinfo_and_skipped_paths): Expect conflicts in the output and status


On the file externals branch.

* branches/file-externals:

Merge r33066 through r33081 from trunk.

  1. … 5 more files in changeset.
Fix a test that broke on Win32 because it was not using platform-independent

path separators. A follow-up to 33082.

* subversion/test/cmdline/

(another_hudson_problem): Expect to see output in the local-path-style.

* subversion/svn/main.c

(main): Disallow simultaneous use of --with-all-revprops and

--with-no-revprops, following up to r33085.

Suggested by: danielsh

Add new command line switch "--with-no-revprops" to the svn log CLI.

Extend the DAV protocol with a "no-revprops" flag, and update ra_serf

and ra_neon to send this flag if the revprops array is empty. This

brings the DAV protocol on par with the SVN protocol, and exposes this

functionality to command line users.

Patch by: Eirik Bjørsnøs <>

(Only very minor tweaks by me, such as updating the getopt test data.)

* subversion/mod_dav_svn/reports/log.c

(dav_svn__log_report): Read "no-revprops" and leave an empty array

of rev-props to fetch.

* subversion/libsvn_ra_serf/log.c

(svn_ra_serf__get_log): Add "<no-revprops/>" to log report request

if revprops array is empty.

* subversion/libsvn_ra_neon/log.c

(svn_ra_neon__get_log): Add "<no-revprops/>" to log report request

if revprops array is empty.

* subversion/svn/cl.h

(svn_cl__opt_state_t): Add no_revprops. Fix existing comment, too.

* subversion/svn/log-cmd.c

(svn_cl__log): Check for --with-no-revprops only being used in XML mode.

(svn_cl__log): Create an empty revprops array if no_revprops is set.

* subversion/svn/main.c

(svn_cl__longopt_t): Add opt_with_no_revprops.

(svn_cl__options): Add "with-no-revprops" option.

(svn_cl__cmd_table."log"): Add opt_with_no_revprops.

(main): Check for opt_with_no_revprops being set.

* notes/webdav-protocol

(log-report): Add "no-revprops" option.

* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout:

Adjust for above.

Remove an unwanted file. A follow-up to r33082.

* README.branch


Remove the tree-conflicts branch, as it was merged to trunk in r33082.
Merge the tree-conflicts branch back to trunk. This implements basic tree

conflict detection for most cases.

See this email thread: <>.

    • ?
  1. … 38 more files in changeset.
* www/faq.html

(globalrev): Mention and link to the tags discussion in the svn book on

how to distinguish releases.