Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-newbranch @ 5045:f191bc3916f7
merge: do early copy to deal with issue636
Without copies/renames, merges source names are 1:1 with their
targets. Copies and renames introduce the possibility that there will
be two merges with the same input but different output. By doing the
copy to the destination name before the merge, the actual merge
becomes 1:1 again, and no source is the input to two different merges.
- add a preliminary scan to applyupdates to do copies
- for the merge action, pass the old name (for finding ancestors) and
the new name (for input to the merge) to filemerge
- eliminate the old post-merge copy
- lookup file contents from new name in filemerge
- pass new name to external merge helper
- report merge failure at new name
- add a test
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 01 Aug 2007 12:33:12 -0500 |
parents | bbc97d419b16 |
children |
line wrap: on
line source
#!/bin/sh hg init t cd t hg branches echo foo > a hg add a hg ci -m "initial" -d "1000000 0" hg branch foo hg branch hg ci -m "add branch name" -d "1000000 0" hg branch bar hg ci -m "change branch name" -d "1000000 0" echo % branch shadowing hg branch default hg branch -f default hg ci -m "clear branch name" -d "1000000 0" hg co foo hg branch echo bleah > a hg ci -m "modify a branch" -d "1000000 0" hg merge hg branch hg ci -m "merge" -d "1000000 0" hg log hg branches hg branches -q echo % test for invalid branch cache hg rollback cp .hg/branch.cache .hg/bc-invalid hg log -r foo cp .hg/bc-invalid .hg/branch.cache hg --debug log -r foo rm .hg/branch.cache echo corrupted > .hg/branch.cache hg log -qr foo cat .hg/branch.cache echo % update with no arguments: tipmost revision of the current branch hg up -q -C 0 hg up -q hg id hg up -q 1 hg up -q hg id hg branch foobar hg up echo % fastforward merge hg branch ff echo ff > ff hg ci -Am'fast forward' -d '1000000 0' hg up foo hg merge ff hg branch hg commit -m'Merge ff into foo' -d '1000000 0' hg parents hg manifest exit 0