Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-annotate @ 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 | 7a7d4937272b |
children | 2192001e4bb4 |
line wrap: on
line source
#!/bin/sh HGMERGE=true; export HGMERGE echo % init hg init echo % commit echo 'a' > a hg ci -A -m test -u nobody -d '1 0' echo % annotate -c hg annotate -c a echo % annotate -d hg annotate -d a echo % annotate -n hg annotate -n a echo % annotate -u hg annotate -u a echo % annotate -cdnu hg annotate -cdnu a cat <<EOF >>a a a EOF hg ci -ma1 -d '1 0' hg cp a b hg ci -mb -d '1 0' cat <<EOF >> b b b b EOF hg ci -mb2 -d '2 0' echo % annotate b hg annotate b echo % annotate -nf b hg annotate -nf b hg up -C 2 cat <<EOF >> b b c b EOF hg ci -mb2.1 -d '2 0' hg merge hg ci -mmergeb -d '3 0' echo % annotate after merge hg annotate -nf b hg up -C 1 hg cp a b cat <<EOF > b a z a EOF hg ci -mc -d '3 0' hg merge cat <<EOF >> b b c b EOF echo d >> b hg ci -mmerge2 -d '4 0' echo % annotate after rename merge hg annotate -nf b echo % linkrev vs rev hg annotate -r tip a # test issue 589 # annotate was crashing when trying to --follow something # like A -> B -> A echo % generate ABA rename configuration echo foo > foo hg add foo hg ci -m addfoo hg rename foo bar hg ci -m renamefoo hg rename bar foo hg ci -m renamebar echo % annotate after ABA with follow hg annotate --follow foo