Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-tags.out @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
parents | f9b8ea362b49 |
children |
rev | line source |
---|---|
4662
f9b8ea362b49
identify: show nullid for empty repo
Matt Mackall <mpm@selenic.com>
parents:
4651
diff
changeset
|
1 000000000000 tip |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1986
diff
changeset
|
2 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
993
diff
changeset
|
3 0acdaf898367 tip |
4143
26314500a5e1
Don't truncate tag and branch names after 30 chars (introduced 73860ffbe798)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3577
diff
changeset
|
4 tip 0:0acdaf898367 |
26314500a5e1
Don't truncate tag and branch names after 30 chars (introduced 73860ffbe798)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3577
diff
changeset
|
5 This is a local tag with a really long name! 0:0acdaf898367 |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
993
diff
changeset
|
6 0acdaf8983679e0aac16e811534eb49d7ee1f2b4 first |
2973
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2320
diff
changeset
|
7 tip 1:8a3ca90d111d |
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2320
diff
changeset
|
8 first 0:0acdaf898367 |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
993
diff
changeset
|
9 8a3ca90d111d tip |
748 | 10 M a |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
993
diff
changeset
|
11 8a3ca90d111d+ tip |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1986
diff
changeset
|
12 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
993
diff
changeset
|
13 0acdaf898367+ first |
2973
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2320
diff
changeset
|
14 0acdaf898367+ first |
748 | 15 M a |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
993
diff
changeset
|
16 8216907a933d tip |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1986
diff
changeset
|
17 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1986
diff
changeset
|
18 (branch merge, don't forget to commit) |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
993
diff
changeset
|
19 8216907a933d+8a3ca90d111d+ tip |
993 | 20 M .hgtags |
2974
eef469259745
tag: shorten hash in default commit message
Matt Mackall <mpm@selenic.com>
parents:
2973
diff
changeset
|
21 tip 6:e2174d339386 |
2973
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2320
diff
changeset
|
22 first 0:0acdaf898367 |
2320
dbdce3b99988
fix parsing of tags. make parse errors useful. add new tag tests.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
23 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3496
baa271270829
Use file contexts in tags code
Matt Mackall <mpm@selenic.com>
parents:
2974
diff
changeset
|
24 .hgtags@c071f74ab5eb, line 2: cannot parse entry |
baa271270829
Use file contexts in tags code
Matt Mackall <mpm@selenic.com>
parents:
2974
diff
changeset
|
25 .hgtags@c071f74ab5eb, line 4: node 'foo' is not well formed |
baa271270829
Use file contexts in tags code
Matt Mackall <mpm@selenic.com>
parents:
2974
diff
changeset
|
26 .hgtags@4ca6f1b1a68c, line 2: node 'x' is not well formed |
2320
dbdce3b99988
fix parsing of tags. make parse errors useful. add new tag tests.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
27 localtags, line 1: tag 'invalid' refers to unknown node |
2973
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2320
diff
changeset
|
28 tip 8:4ca6f1b1a68c |
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2320
diff
changeset
|
29 first 0:0acdaf898367 |
2320
dbdce3b99988
fix parsing of tags. make parse errors useful. add new tag tests.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
30 changeset: 8:4ca6f1b1a68c |
3496
baa271270829
Use file contexts in tags code
Matt Mackall <mpm@selenic.com>
parents:
2974
diff
changeset
|
31 .hgtags@c071f74ab5eb, line 2: cannot parse entry |
baa271270829
Use file contexts in tags code
Matt Mackall <mpm@selenic.com>
parents:
2974
diff
changeset
|
32 .hgtags@c071f74ab5eb, line 4: node 'foo' is not well formed |
baa271270829
Use file contexts in tags code
Matt Mackall <mpm@selenic.com>
parents:
2974
diff
changeset
|
33 .hgtags@4ca6f1b1a68c, line 2: node 'x' is not well formed |
2320
dbdce3b99988
fix parsing of tags. make parse errors useful. add new tag tests.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
34 localtags, line 1: tag 'invalid' refers to unknown node |
1986
719cf07b076d
add checking for invalid entries in tag files
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1933
diff
changeset
|
35 tag: tip |
2320
dbdce3b99988
fix parsing of tags. make parse errors useful. add new tag tests.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
36 parent: 3:b2ef3841386b |
1986
719cf07b076d
add checking for invalid entries in tag files
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1933
diff
changeset
|
37 user: test |
719cf07b076d
add checking for invalid entries in tag files
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1933
diff
changeset
|
38 date: Mon Jan 12 13:46:40 1970 +0000 |
2320
dbdce3b99988
fix parsing of tags. make parse errors useful. add new tag tests.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
39 summary: head |
1986
719cf07b076d
add checking for invalid entries in tag files
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1933
diff
changeset
|
40 |
3577
7f7425306925
Correct optimization from 3464f5e77f34; add a test.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3496
diff
changeset
|
41 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7f7425306925
Correct optimization from 3464f5e77f34; add a test.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3496
diff
changeset
|
42 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7f7425306925
Correct optimization from 3464f5e77f34; add a test.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3496
diff
changeset
|
43 tip 4:36195b728445 |
4215
e29f2db5ab18
Make the tags algorithm smarter
Matt Mackall <mpm@selenic.com>
parents:
4143
diff
changeset
|
44 bar 1:b204a97e6e8d |
4217 | 45 changeset: 5:57e1983b4a60 |
46 tag: tip | |
47 user: test | |
48 date: Mon Jan 12 13:46:40 1970 +0000 | |
49 summary: Removed tag bar | |
50 | |
51 tip 5:57e1983b4a60 | |
4651
7176f278d6f9
Test attempt to remove nonexistent tag
Brendan Cully <brendan@kublai.com>
parents:
4494
diff
changeset
|
52 % remove nonexistent tag |
7176f278d6f9
Test attempt to remove nonexistent tag
Brendan Cully <brendan@kublai.com>
parents:
4494
diff
changeset
|
53 abort: tag foobar does not exist |
7176f278d6f9
Test attempt to remove nonexistent tag
Brendan Cully <brendan@kublai.com>
parents:
4494
diff
changeset
|
54 changeset: 5:57e1983b4a60 |
7176f278d6f9
Test attempt to remove nonexistent tag
Brendan Cully <brendan@kublai.com>
parents:
4494
diff
changeset
|
55 tag: tip |
7176f278d6f9
Test attempt to remove nonexistent tag
Brendan Cully <brendan@kublai.com>
parents:
4494
diff
changeset
|
56 user: test |
7176f278d6f9
Test attempt to remove nonexistent tag
Brendan Cully <brendan@kublai.com>
parents:
4494
diff
changeset
|
57 date: Mon Jan 12 13:46:40 1970 +0000 |
7176f278d6f9
Test attempt to remove nonexistent tag
Brendan Cully <brendan@kublai.com>
parents:
4494
diff
changeset
|
58 summary: Removed tag bar |
7176f278d6f9
Test attempt to remove nonexistent tag
Brendan Cully <brendan@kublai.com>
parents:
4494
diff
changeset
|
59 |
4272
fe7f38dda34b
tags: fix abababa case, with test case
Matt Mackall <mpm@selenic.com>
parents:
4217
diff
changeset
|
60 tip 5:d8bb4d1eff25 |
fe7f38dda34b
tags: fix abababa case, with test case
Matt Mackall <mpm@selenic.com>
parents:
4217
diff
changeset
|
61 bar 0:b409d9da318e |
fe7f38dda34b
tags: fix abababa case, with test case
Matt Mackall <mpm@selenic.com>
parents:
4217
diff
changeset
|
62 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
fe7f38dda34b
tags: fix abababa case, with test case
Matt Mackall <mpm@selenic.com>
parents:
4217
diff
changeset
|
63 tip 6:b5ff9d142648 |
fe7f38dda34b
tags: fix abababa case, with test case
Matt Mackall <mpm@selenic.com>
parents:
4217
diff
changeset
|
64 bar 0:b409d9da318e |
4273
8185a1ca8628
tags: require -f to replace an existing tag
Matt Mackall <mpm@selenic.com>
parents:
4272
diff
changeset
|
65 abort: a tag named bar already exists (use -f to force) |
8185a1ca8628
tags: require -f to replace an existing tag
Matt Mackall <mpm@selenic.com>
parents:
4272
diff
changeset
|
66 tip 6:b5ff9d142648 |
8185a1ca8628
tags: require -f to replace an existing tag
Matt Mackall <mpm@selenic.com>
parents:
4272
diff
changeset
|
67 bar 0:b409d9da318e |
4494
99f411ba0380
use .extend instead of .append in readtags
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4273
diff
changeset
|
68 adding foo |
99f411ba0380
use .extend instead of .append in readtags
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4273
diff
changeset
|
69 tip 3:ca8479b4351c |
99f411ba0380
use .extend instead of .append in readtags
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4273
diff
changeset
|
70 bar 2:72b852876a42 |
99f411ba0380
use .extend instead of .append in readtags
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4273
diff
changeset
|
71 % bar should still point to rev 2 |
99f411ba0380
use .extend instead of .append in readtags
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4273
diff
changeset
|
72 tip 4:40af5d225513 |
99f411ba0380
use .extend instead of .append in readtags
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4273
diff
changeset
|
73 bar 2:72b852876a42 |