Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-tag @ 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 | 5fb8f5992a3d |
children |
rev | line source |
---|---|
800
ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
1 #!/bin/sh |
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff
changeset
|
2 |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff
changeset
|
3 hg init |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff
changeset
|
4 echo a > a |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff
changeset
|
5 hg add a |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1654
diff
changeset
|
6 hg commit -m "test" -d "1000000 0" |
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff
changeset
|
7 hg history |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1654
diff
changeset
|
8 hg tag -d "1000000 0" "bleah" |
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff
changeset
|
9 hg history |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff
changeset
|
10 |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff
changeset
|
11 echo foo >> .hgtags |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1654
diff
changeset
|
12 hg tag -d "1000000 0" "bleah2" || echo "failed" |
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1654
diff
changeset
|
13 hg tag -d "1000000 0" -r 0 "bleah2" 1 || echo "failed" |
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
diff
changeset
|
14 |
1596
41366b7d6709
fix 'hg tag <tagname> <revision>
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1561
diff
changeset
|
15 hg revert .hgtags |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1654
diff
changeset
|
16 hg tag -d "1000000 0" -r 0 "bleah0" |
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1654
diff
changeset
|
17 hg tag -l -d "1000000 0" "bleah1" 1 |
1596
41366b7d6709
fix 'hg tag <tagname> <revision>
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1561
diff
changeset
|
18 |
41366b7d6709
fix 'hg tag <tagname> <revision>
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1561
diff
changeset
|
19 cat .hgtags |
41366b7d6709
fix 'hg tag <tagname> <revision>
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1561
diff
changeset
|
20 cat .hg/localtags |
41366b7d6709
fix 'hg tag <tagname> <revision>
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1561
diff
changeset
|
21 |
2641
46182568b4ce
change 'hg tag' to tag the parent rev instead of tip
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1933
diff
changeset
|
22 hg update 0 |
46182568b4ce
change 'hg tag' to tag the parent rev instead of tip
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1933
diff
changeset
|
23 hg tag -d "1000000 0" "foobar" |
46182568b4ce
change 'hg tag' to tag the parent rev instead of tip
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1933
diff
changeset
|
24 cat .hgtags |
46182568b4ce
change 'hg tag' to tag the parent rev instead of tip
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1933
diff
changeset
|
25 cat .hg/localtags |
46182568b4ce
change 'hg tag' to tag the parent rev instead of tip
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1933
diff
changeset
|
26 |
1561
9c6d0abdb94e
disallow '\n' and '\r' in tag names
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1308
diff
changeset
|
27 hg tag -l 'xx |
9c6d0abdb94e
disallow '\n' and '\r' in tag names
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1308
diff
changeset
|
28 newline' |
9c6d0abdb94e
disallow '\n' and '\r' in tag names
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1308
diff
changeset
|
29 hg tag -l 'xx:xx' |
4913
f0c25ed40ec6
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)
Bryan O'Sullivan <bos@serpentine.com>
parents:
2641
diff
changeset
|
30 |
f0c25ed40ec6
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)
Bryan O'Sullivan <bos@serpentine.com>
parents:
2641
diff
changeset
|
31 echo % issue 601 |
4914
5fb8f5992a3d
fix test-tag on Solaris
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4913
diff
changeset
|
32 python << EOF |
5fb8f5992a3d
fix test-tag on Solaris
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4913
diff
changeset
|
33 f = file('.hg/localtags'); last = f.readlines()[-1][:-1]; f.close() |
5fb8f5992a3d
fix test-tag on Solaris
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4913
diff
changeset
|
34 f = file('.hg/localtags', 'w'); f.write(last); f.close() |
5fb8f5992a3d
fix test-tag on Solaris
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4913
diff
changeset
|
35 EOF |
4913
f0c25ed40ec6
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)
Bryan O'Sullivan <bos@serpentine.com>
parents:
2641
diff
changeset
|
36 cat .hg/localtags |
f0c25ed40ec6
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)
Bryan O'Sullivan <bos@serpentine.com>
parents:
2641
diff
changeset
|
37 hg tag -l localnewline |
f0c25ed40ec6
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)
Bryan O'Sullivan <bos@serpentine.com>
parents:
2641
diff
changeset
|
38 cat .hg/localtags |
f0c25ed40ec6
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)
Bryan O'Sullivan <bos@serpentine.com>
parents:
2641
diff
changeset
|
39 |
4914
5fb8f5992a3d
fix test-tag on Solaris
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4913
diff
changeset
|
40 python << EOF |
5fb8f5992a3d
fix test-tag on Solaris
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4913
diff
changeset
|
41 f = file('.hgtags'); last = f.readlines()[-1][:-1]; f.close() |
5fb8f5992a3d
fix test-tag on Solaris
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4913
diff
changeset
|
42 f = file('.hgtags', 'w'); f.write(last); f.close() |
5fb8f5992a3d
fix test-tag on Solaris
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4913
diff
changeset
|
43 EOF |
4913
f0c25ed40ec6
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)
Bryan O'Sullivan <bos@serpentine.com>
parents:
2641
diff
changeset
|
44 hg ci -d '1000000 0' -m'broken manual edit of .hgtags' |
f0c25ed40ec6
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)
Bryan O'Sullivan <bos@serpentine.com>
parents:
2641
diff
changeset
|
45 cat .hgtags |
f0c25ed40ec6
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)
Bryan O'Sullivan <bos@serpentine.com>
parents:
2641
diff
changeset
|
46 hg tag -d '1000000 0' newline |
f0c25ed40ec6
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)
Bryan O'Sullivan <bos@serpentine.com>
parents:
2641
diff
changeset
|
47 cat .hgtags |