r871236, r870851, r870850, r867284

r867284 | kameshj | 2007-10-16 10:42:19 +0000 (Tue, 16 Oct 2007)

Fix logical error of passing unrelated data.
Over IRC MsShu hinted of passing 'rel_path' as 'child_url'
to 'mark_mergeinfo_as_inheritable_for_a_range'.

Senthil attempted to write a shell testcase to prove this failure 
but he kept hitting other edge case errors which he will file as separate 
issues, I am fixing this logical error meanwhile as it interferes with my 
other work.

* subversion/libsvn_client/merge.c
  (discover_and_merge_children): Increase the scope of 
   'child_merge_src_canon_path'. Remove 'child_url' as it is no more used.
   Call 'mark_mergeinfo_as_inheritable_for_a_range' with 
   'child_merge_src_canon_path' instead of 'child_url'.

Found by: MsShu

r870850 | kameshj | 2008-04-25 12:26:40 +0000 (Fri, 25 Apr 2008)

Testcase to show issue 3181.
svndumpfilter drops mergeinfo when it is *not* run with --renumber-revs.

* subversion/tests/cmdline/
  (svndumpfilter_loses_mergeinfo): New function.
  (test_list): Add 'svndumpfilter_loses_mergeinfo' as XFail test.

Found by: MsShu

r870851 | kameshj | 2008-04-25 12:39:23 +0000 (Fri, 25 Apr 2008)

Fix issue 3181.
svndumpfilter drops mergeinfo when it is *not* run with --renumber-revs.

* subversion/svndumpfilter/main.c
  (adjust_mergeinfo): Always populate 'final_mergeinfo'.

* subversion/tests/cmdline/
  (test_list): Remove XFail marker from 'svndumpfilter_loses_mergeinfo'.

Found by: MsShu

r871236 | cmpilato | 2008-05-14 14:20:05 +0000 (Wed, 14 May 2008)

Fix a bug which caused filenames with a single character before the
extension to not split correctly.

* subversion/libsvn_subr/path.c
  (svn_path_splitext): Fix an off-by-one error.

* subversion/tests/libsvn_subr/path-test.c
  (test_splitext): Update test to cover the bug fixed here.

Found by: MsShu