Piet-Hein Peeters


r25646 | kameshj | 2007-07-04 13:50:49 -0500 (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