Mercurial > hg
view tests/test-annotate @ 5096:ad6b97132b81
merge: fix a copy detection bug (issue672)
When merging rev1 and rev2, we want to search for copies that happened
in rev1 but not in rev2 and vice-versa. We were starting the search at
rev1/rev2 and then going back, stopping as soon as we reached the revno
of the ancestor, but that can miss some cases (see the new
test-issue672).
Now we calculate the revisions that are ancestors of rev1 or rev2 (but
not both) and make sure the search doesn't stop too early.
Simplified test provided by mpm, based on a test case provided by
Edward Lee.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sun, 12 Aug 2007 12:15:10 -0300 |
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