pbu...@apache.org wrote on Fri, May 17, 2013 at 18:45:53 -0000: > Author: pburba > Date: Fri May 17 18:45:53 2013 > New Revision: 1483947 > > URL: http://svn.apache.org/r1483947 > Log: > Fix issue #4367 'merge to shallow WC, repeat merge to infinite depth WC is > broken'. > > * subversion/libsvn_client/merge.c > > (merge_dir_opened, > merge_dir_added): A merge may be broken into multiple editor drives. > One drive may add a directory and then a later one might delete it. So > don't assume the copy from revision (which must always exist for a merge) > on an added directory is dictated by the larger merge source, use the > (possibly different) revision from the editor drive. > > * subversion/tests/cmdline/merge_tests.py > > (merge_to_empty_target_merge_to_infinite_target): Remove XFail decorator. > > Modified: > subversion/trunk/subversion/libsvn_client/merge.c > subversion/trunk/subversion/tests/cmdline/merge_tests.py > > --- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original) > +++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri May 17 > 18:45:53 2013 > @@ -19010,7 +19010,6 @@ def conflicted_split_merge_with_resolve( > # depth WC is broken'. > @SkipUnless(server_has_mergeinfo) > @Issues(4367) > -@XFail() > def merge_to_empty_target_merge_to_infinite_target(sbox): > "repeat merge to infinite depth WC conflicts" > > @@ -19154,7 +19153,7 @@ def merge_to_empty_target_merge_to_infin > None, 1, 0) > > # Commit the merge. > - sbox.simple_commit() > + #sbox.simple_commit()
Was this hunk intentional?
