Mercurial > hg
view tests/test-status.out @ 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 | a7b61c3b0f93 |
children | c2a21fe60994 a1ebd5cd7e55 |
line wrap: on
line source
hg status in repo root: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status . in repo root: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status in a: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status . in a: ? 1/in_a_1 ? in_a hg status .. in a: ? 1/in_a_1 ? in_a ? ../b/1/in_b_1 ? ../b/2/in_b_2 ? ../b/in_b ? ../in_root hg status in b: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status . in b: ? 1/in_b_1 ? 2/in_b_2 ? in_b hg status .. in b: ? ../a/1/in_a_1 ? ../a/in_a ? 1/in_b_1 ? 2/in_b_2 ? in_b ? ../in_root hg status in a/1: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status . in a/1: ? in_a_1 hg status .. in a/1: ? in_a_1 ? ../in_a hg status in b/1: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status . in b/1: ? in_b_1 hg status .. in b/1: ? in_b_1 ? ../2/in_b_2 ? ../in_b hg status in b/2: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status . in b/2: ? in_b_2 hg status .. in b/2: ? ../1/in_b_1 ? in_b_2 ? ../in_b adding .hgignore adding deleted adding modified adding removed hg status: A added R removed ! deleted ? unknown hg status modified added removed deleted unknown never-existed ignored: never-existed: No such file or directory A added R removed ! deleted ? ignored ? unknown hg status -C: A added A copied modified R removed ! deleted ? unknown hg status -A: A added A copied modified R removed ! deleted ? unknown I ignored C .hgignore C modified