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

Changeset 872808 is being indexed.

In the ctypes-python-bindings branch:


(): Remove completed tasks and fix typo.

Suggested by: arfrever

Merge r32494, r32522, and r32523 from trunk to 1.5.x branch.

* r32494, r32522, r32523

Fix a bug where previous merges are incorrectly reversed leading to repeat

merges and spurious conflicts.


r32494 is just a doc string tweak that hopefully makes the real fix a

easier to review, r32522 is a test for the bug, and r32523 is the real

fix. There is a trivial conflict on r32494 when adding the new merge

test due to the fact that some other new merge tests are not backported



Repeat merges and needless conflicts in the age of merge tracking are,

to put it mildly, less than desirable, see


+1: pburba, julianfoad, cmpilato

Cast some more votes.
* STATUS: Vote for r32703.

Trivial comment formatting tweak.
Merge r32491 from trunk:

* r32491

Fix test failures in non-English locale.


+1: arfrever, cmpilato

+0: hwright

Merge r32442 from trunk:

* r32442

Respect LDFLAGS in SWIG bindings without the requirement of the exporting

of the SWIG_LDFLAGS variable.


+1: arfrever

+0: cmpilato

Merge r32416, r32421 from trunk:

* r32416, r32421

Respect LDFLAGS in Perl bindings.


Previously LDFLAGS were ignored (except for libsvn_swig_perl) even when

the SWIG_LDFLAGS variable was set.


+1: arfrever

+0: cmpilato

Fix code formatting in some headers.

* subversion/include/svn_auth.h:

* subversion/include/svn_base64.h:

* subversion/include/svn_client.h:

* subversion/include/svn_config.h:

* subversion/include/svn_delta.h:

* subversion/include/svn_dso.h:

* subversion/include/svn_error.h:

* subversion/include/svn_fs.h:

* subversion/include/svn_hash.h:

* subversion/include/svn_io.h:

* subversion/include/svn_ra.h:

* subversion/include/svn_ra_svn.h:

* subversion/include/svn_repos.h:

* subversion/include/svn_utf.h: Place function types on separate lines.

Suggested by: julianfoad

Cast votes, approving some changes.
Fix the following warning printed by 'configure':

config.status: WARNING: '' seems to ignore the --datarootdir setting


(datarootdir): Define.

In the cmdline tests, fix the PATH string in "ACTUAL DISK" tree nodes. Also

fix 1, which relied on the erratic PATH. The only visible

effect of this fix is that the Python-script form of the tree is printed

correctly in the error output of a failing test.

(Previously, an "ACTUAL DISK" tree node only got a PATH string of two

elements, its parent and itself, breaking PATHs at a depth of more than 2.

In a side-effect, the svntest.tree.root_node_name was missing from each


Patch by: Neels Hofmeyr <>

* subversion/tests/cmdline/svntest/

(handle_dir): Reverse the order in which nodes are added to the tree,

thus fixing PATH strings.

* subversion/tests/cmdline/

(detect_extra_files): Strip the svntest.tree.root_node_name from nodes'

PATH before using it as a real file system path.

Remove the "Merge Kludge" from the test suite. This code was introduced to

work around issue #767 and issue #2411 which have both been fixed long ago.

See this email discussion on removing it:


* subversion/tests/cmdline/

Don't import shorten_path_kludge().

(mergeinfo_and_skipped_paths): Remove all uses of the kludge, and

the associated chdir's.

* subversion/tests/cmdline/

Don't import shorten_path_kludge().

(merge_sensitive_log_added_mergeinfo_replaces_inherited): Remove all uses

of the kludge, and the associated chdir's.

* subversion/tests/cmdline/

(shorten_path_kludge): Remove.

In all tests, remove all uses of the kludge, and the associated chdir's.

* subversion/tests/cmdline/

(mergeinfo_switch_elision): Remove shorten_path_kludge(), its uses, and

the associated chdir's.

* subversion/tests/cmdline/

(mergeinfo_update_elision): Remove shorten_path_kludge(), its uses, and

the associated chdir's.


(1.5.2): Bring up-to-date with merges to 1.5.x.

Merge r31725, r31837 from trunk:

* r31725, r31837

Canonicalise URIs which have an empty hostname part correctly.

This fixes the crash described in #2116 ('svn log file:///'

results in a failed assertion).


Been fixed in trunk for a while, rediscovered in 1.5.1 by

Toby Peterson <>, see this thread:


r31837 fixes a bug introduced in r31725:

Take an early out if path is "", to avoid accessing uninitialized

memory later when we look at *(dst - 1).


+1: stsp, danielsh, rhuijben

* STATUS: Nominate r32643, r32706, r32707.

On the fs-rep-sharing branch:

* subversion/libsvn_fs_base/fs.h

(SVN_FS_BASE__MIN_REP_SHARING_FORMAT): Fix the doc string.

* subversion/libsvn_subr/simple_providers.c

(prompt_for_simple_creds): s/def_/default_/ since the meaning will be

instantly clear.

Suggested by: kfogel

* STATUS: Vote on the r31725 group and move the group to Approved.

* subversion/include/svn_client.h

Merge the two Doxygen groups called 'clnt_ctx' because Doxygen warned that

it was ignoring comments in the second one.

Fix some Doxygen mark-up.

* subversion/include/svn_fs.h

(svn_fs_access_add_lock_token2, svn_fs_file_md5_checksum): Tweak doc-strings.

French translation update for r32711.

* subversion/po/fr.po: po-update + 1 fuzzy and 3 new translations.

French translation update for r32711

* subversion/po/fr.po: po-update & 1 fuzzy fixed.

Improve compatibility with versions of Ruby before 1.8.5.

* subversion/bindings/swig/ruby/test/test_client.rb

(SvnClientTest#assert_mkdir_with_multiple_paths, SvnClientTest#test_mkdir_p,

SvnClientTest#test_copy): Use instead of Kernel#Pathname.

On the fs-rep-sharing branch:

Bring up-to-date with trunk. This decreases the cumulative diff due to the

previous merge of the svn_checksum_t work to trunk.

Made possible by: pburba

    • ?
  1. … 171 more files in changeset.
Merge obvious fix r32708 from trunk.

* subversion/include/svn_opt.h

(svn_opt_args_to_target_array2): Add @deprecated tag.

* subversion/include/svn_opt.h

(svn_opt_args_to_target_array2): Add @deprecated tag.

Fix yet another issue #3067 bug.

When driving the merge report editor and the merge target has subtrees that

need different ranges applied, there was a case we didn't handle: A subtree

may need a range merged that doesn't intersect with the range its nearest

parent requires *nor* that any other subtree requires. In some cases this

could cause us to describe path/revisions to the reporter that don't exist

resulting in the dreaded "svn: Working copy path 'blah' does not exist in

repository" errors.

* subversion/libsvn_client/merge.c

(drive_merge_report_editor): When merging a range X:Y if we find a subtree

that doesn't need any part of that range merged then don't describe that

subtree to the reporter.

* subversion/tests/cmdline/

(test_list): Remove XFail from


Add yet another issue #3067 merge test.

* subversion/tests/cmdline/

(merge_target_and_subtrees_need_nonintersecting_ranges): New.

(test_list): Add merge_target_and_subtrees_need_nonintersecting_ranges

and mark as XFail.

Remove some cruft from

* subversion/tests/cmdline/

(subtree_source_missing_in_requested_range): Remove unneeded repeat update.