Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-strict @ 5149: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 | 4e815ee377fd |
children |
rev | line source |
---|---|
2971
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
1 #!/bin/sh |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
3 hg init |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
4 |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
5 echo a > a |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
6 hg ci -d '0 0' -Ama |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
7 |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
8 hg an a |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
9 |
2978
4e815ee377fd
Make test-strict append to $HGRCPATH, like other tests do since 61fcd9fac434.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2971
diff
changeset
|
10 echo "[ui]" >> $HGRCPATH |
4e815ee377fd
Make test-strict append to $HGRCPATH, like other tests do since 61fcd9fac434.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2971
diff
changeset
|
11 echo "strict=True" >> $HGRCPATH |
2971
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
12 |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
13 hg an a |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
14 hg annotate a |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
15 |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
16 echo % should succeed - up is an alias, not an abbreviation |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
17 |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
18 hg up |