No-op merge (without skip) should not change mergeinfo

http://subversion.tigris.org/issues/show_bug.cgi?id=2883







------- Additional comments from pburbatigris.org Thu Oct 18 07:27:44 -0700 2007 -------
Re "# And more ugliness (this should be spun off as a
separate issue)" above,
this has been partially fixed on trunk:

>svn merge %URL64%/A/D merge_tests-64A_COPYD -r3:9
--- Merging r5 into 'merge_tests-64A_COPYDG':
--- Merging r6 through r9 into
'merge_tests-64A_COPYDHomega':
U    merge_tests-64A_COPYDHomega
 G   merge_tests-64A_COPYDH

>svn pl -vR merge_tests-64
Properties on 'merge_tests-64ADH':
  prop:name : propval
Properties on 'merge_tests-64A_COPY':
  svn:mergeinfo : /A:1
Properties on 'merge_tests-64A_COPYBEbeta':
  svn:mergeinfo : /A/B/E/beta:1,5
Properties on 'merge_tests-64A_COPYD':
  svn:mergeinfo : /A/D:1,4-9
Properties on 'merge_tests-64A_COPYDH':
  prop:name : propval

The mergeinfo is now correct, but we (still) get a repeat
merge on r9's prop add
to A_COPY/D/H:

 G   merge_tests-64A_COPYDH

And it's worth noting that this occurs under the
notification for one of
A_COPY/D/H's children!

So that is definitely a new issue.  But following the
standard
one-step-forward-three-steps-back procedure I found another
problem:

Revert the previous change and we have the following
mergeinfo:

>svn pl -vR merge_tests-64
Properties on 'merge_tests-64ADH':
  prop:name : propval
Properties on 'merge_tests-64A_COPY':
  svn:mergeinfo : /A:1
Properties on 'merge_tests-64A_COPYBEbeta':
  svn:mergeinfo : /A/B/E/beta:1,5
Properties on 'merge_tests-64A_COPYD':
  svn:mergeinfo : /A/D:1,6-9
Properties on 'merge_tests-64A_COPYDG':
  svn:mergeinfo : /A/D/G:1,4,6-9*
Properties on 'merge_tests-64A_COPYDH':
  prop:name : propval
  svn:mergeinfo : /A/D/H:1,6-9*

# Now do an operative merge, but without the problematic
# r9 from the previous merge.
>svn merge %URL64%/A/D merge_tests-64A_COPYD -r3:8
--- Merging r5 into 'merge_tests-64A_COPYDG':
--- Merging r6 through r8 into
'merge_tests-64A_COPYDHomega':
U    merge_tests-64A_COPYDHomega

# Whoa, what happened to r9* on 'A_COPYDG' and
# 'A_COPYDH'?  It should still be there!
>svn pl -vR merge_tests-64
Properties on 'merge_tests-64ADH':
  prop:name : propval
Properties on 'merge_tests-64A_COPY':
  svn:mergeinfo : /A:1
Properties on 'merge_tests-64A_COPYBEbeta':
  svn:mergeinfo : /A/B/E/beta:1,5
Properties on 'merge_tests-64A_COPYD':
  svn:mergeinfo : /A/D:1,4-9
Properties on 'merge_tests-64A_COPYDG':
  svn:mergeinfo : /A/D/G:1,4-8
Properties on 'merge_tests-64A_COPYDH':
  prop:name : propval
  svn:mergeinfo : /A/D/H:1,4-8

------------------------------------------------------------
---------
To unsubscribe, e-mail: issues-unsubscribesubversion.tigris.org
For additional commands, e-mail: issues-helpsubversion.tigris.org