Piet-Hein Peeters <piet-hein.peeters@philips.com>

Found Review
r938071, r865720 r868349

r865720 | kameshj | 2007-07-04 18:50:49 +0000 (Wed, 04 Jul 2007)

Fix the problem: Two people from 2 different working copies at revision rX 
trying to do a merge of rY and rZ independently from /branch/b1 to /trunk. 
Assume the first person commits(merge of rY), when second guy tries to
do the commit(merge of rZ) he would get a out of date error. So second
guy would do 'svn up'. svn up does not merge the 'svn:mergeinfo' correctly
It just keeps rZ.

* subversion/libsvn_wc/props.c
  (svn_wc__merge_props): Record the merged svn:mergeinfo on the target.
Found by: Piet-Hein Peeters
Reviewed by: dlr

r868349 | rocketraman | 2007-12-05 16:59:26 +0000 (Wed, 05 Dec 2007)

Do not show phantom revisions in the default svnmerge.py commit
log message.

* contrib/client-side/svnmerge.py
  (action_merge): Do not include phantom revs in the log message
    for merged revisions or for record-only revisions.

Patch by: Alan Barrett <apb@cequrux.com>
          Raman Gupta <rocketraman@fastmail.fm>
Review by: dlr
           Piet-Hein Peeters <piet-hein.peeters@philips.com>

r938071 | rhuijben | 2010-04-26 14:49:41 +0000 (Mon, 26 Apr 2010)

Add simple regression test on a copy loses history case identified in this
mail on the Subversion user forum on open.collab.net:


Found by: Piet-Hein Peeters <piet-hein.peeters{_AT_}philips.com>

* subversion/tests/cmdline/copy_tests.py
  (repos_to_wc): [Accidental reversion of r937468 changes. Reverted in 938082]
  (copy_added_dir_with_copy): New test.
  (test_list): Add copy_added_dir_with_copy as XFail test.