[merge tracking] Recording merge info when part of the merge is skipped
From: Daniel Rall <dlr_at_collab.net>
Date: 2006-09-15 20:58:39 CEST
As a follow-up to r21504, I fixed merge_tests.py 7 and 8 in r21511
Test 17 seems to be a little more tricky, as part of its merge
Under dir "C", we create unversioned file "foo". Then we merge a tree
--- C/ foo Merge source: ------------- F/ foo Q/ bar "foo" is skipped (because it's obstructed), while "Q" and "Q/bar" are merged successfully. Where in the WC should the merge info be recorded? My feeling is that merge info should apply to "Q" (and thus implicity to "bar", by inheritance). It should not apply to "foo" (because it was not merged). However, what about "C", which had partial merge of r2 succeed? Because part of the merge was skipped, I tend to think that it should not have merge info recorded on it. Thoughts?
This is an archived mail posted to the Subversion Dev mailing list.