Mercurial > hg
annotate tests/test-help @ 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 | 01215ad04283 |
children | 9ed13f718e53 |
rev | line source |
---|---|
544
3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
429
diff
changeset
|
1 #!/bin/sh |
331 | 2 |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
3 hg |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
4 hg -q |
596 | 5 hg help |
423
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
350
diff
changeset
|
6 hg -q help |
331 | 7 hg add -h |
596 | 8 hg add --skjdfks |
331 | 9 hg help diff |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
10 hg help status |
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
11 hg -q help status |
331 | 12 hg help foo |
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
13 hg skjdfks |
331 | 14 |
423
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
350
diff
changeset
|
15 exit 0 |