Paul Burba wrote: > Anyhow, the test failed for Stefan because the --dry-run output was different: > > The dry-run merge output: > --- Merging r5 through r9 into > 'svn-test-work/working_copies/merge_tests-63.files': > C svn-test-work/working_copies/merge_tests-63.files/B > --- Merging r5 through r9 into > 'svn-test-work/working_copies/merge_tests-63.files/mu': > U svn-test-work/working_copies/merge_tests-63.files/mu > --- Merging r5 through r9 into > 'svn-test-work/working_copies/merge_tests-63.files': > C svn-test-work/working_copies/merge_tests-63.files/D > U svn-test-work/working_copies/merge_tests-63.files > Summary of conflicts: > Tree conflicts: 2 > > It's different yes, but merge_tests-63.files/mu, > merge_tests-63.files/B, and merge_tests-63.files/D are just notified > in a different order, there is nothing wrong with that that I can see, > they are all at the same depth.
What had me concerned about this output was the header lines: --- Merging r5 through r9 into 'svn-test-work/working_copies/merge_tests-63.files': --- Merging r5 through r9 into 'svn-test-work/working_copies/merge_tests-63.files/mu': --- Merging r5 through r9 into 'svn-test-work/working_copies/merge_tests-63.files': "What? Merging r5-r9 to the root of the working copy twice?" But maybe I'm putting too much stock into what those headers are actually saying about the real work going on underneath. -- C. Michael Pilato <cmpil...@collab.net> CollabNet <> www.collab.net <> Distributed Development On Demand
signature.asc
Description: OpenPGP digital signature
