Mercurial > hg

annotate tests/test-tags.out @ 8954:e67e5b60e55f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Branch heads should not include "heads" that are ancestors of other heads. For example, given 1 (branch a) -> 2 (branch b) -> 3 (branch a) I expect "hg heads a" to show only 3. Discovered by running hg heads HEAD on the mutt repo, where older clients committed default on top of HEAD.
author Brendan Cully <brendan@kublai.com>
date Mon, 29 Jun 2009 00:54:23 -0700
parents 5096a47d8aec
children a604c98dbf62
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
2966
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
c5df1a9c5276 Update test output for status change
mpm@selenic.com
parents: 561
diff changeset
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
2966
fb493241d7f6 Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents: 2320
diff changeset
14 0acdaf898367+ first
748
c5df1a9c5276 Update test output for status change
mpm@selenic.com
parents: 561
diff changeset
15 M a
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6321
diff changeset
16 created new head
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
17 8216907a933d tip
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1986
diff changeset
18 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
19 (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
20 8216907a933d+8a3ca90d111d+ tip
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset
21 M .hgtags
2967
eef469259745 tag: shorten hash in default commit message
Matt Mackall <mpm@selenic.com>
parents: 2966
diff changeset
22 tip 6:e2174d339386
2966
fb493241d7f6 Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents: 2320
diff changeset
23 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
24 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6321
diff changeset
25 created new head
3455
baa271270829 Use file contexts in tags code
Matt Mackall <mpm@selenic.com>
parents: 2967
diff changeset
26 .hgtags@c071f74ab5eb, line 2: cannot parse entry
baa271270829 Use file contexts in tags code
Matt Mackall <mpm@selenic.com>
parents: 2967
diff changeset
27 .hgtags@c071f74ab5eb, line 4: node 'foo' is not well formed
baa271270829 Use file contexts in tags code
Matt Mackall <mpm@selenic.com>
parents: 2967
diff changeset
28 .hgtags@4ca6f1b1a68c, line 2: node 'x' is not well formed
2966
fb493241d7f6 Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents: 2320
diff changeset
29 tip 8:4ca6f1b1a68c
fb493241d7f6 Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents: 2320
diff changeset
30 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
31 changeset: 8:4ca6f1b1a68c
3455
baa271270829 Use file contexts in tags code
Matt Mackall <mpm@selenic.com>
parents: 2967
diff changeset
32 .hgtags@c071f74ab5eb, line 2: cannot parse entry
baa271270829 Use file contexts in tags code
Matt Mackall <mpm@selenic.com>
parents: 2967
diff changeset
33 .hgtags@c071f74ab5eb, line 4: node 'foo' is not well formed
baa271270829 Use file contexts in tags code
Matt Mackall <mpm@selenic.com>
parents: 2967
diff changeset
34 .hgtags@4ca6f1b1a68c, line 2: node 'x' is not well formed
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: 3455
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: 3455
diff changeset
42 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6321
diff changeset
43 created new head
3577
7f7425306925 Correct optimization from 3464f5e77f34; add a test.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3455
diff changeset
44 tip 4:36195b728445
4211
e29f2db5ab18 Make the tags algorithm smarter
Matt Mackall <mpm@selenic.com>
parents: 4143
diff changeset
45 bar 1:b204a97e6e8d
6671
938eddd76237 tag: record tag we're superseding, if any (issue 1102)
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
46 changeset: 5:1f98c77278de
4213
3be4785f8994 tags: add --remove
Matt Mackall <mpm@selenic.com>
parents: 4211
diff changeset
47 tag: tip
3be4785f8994 tags: add --remove
Matt Mackall <mpm@selenic.com>
parents: 4211
diff changeset
48 user: test
3be4785f8994 tags: add --remove
Matt Mackall <mpm@selenic.com>
parents: 4211
diff changeset
49 date: Mon Jan 12 13:46:40 1970 +0000
3be4785f8994 tags: add --remove
Matt Mackall <mpm@selenic.com>
parents: 4211
diff changeset
50 summary: Removed tag bar
3be4785f8994 tags: add --remove
Matt Mackall <mpm@selenic.com>
parents: 4211
diff changeset
51
6671
938eddd76237 tag: record tag we're superseding, if any (issue 1102)
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
52 tip 5:1f98c77278de
4651
7176f278d6f9 Test attempt to remove nonexistent tag
Brendan Cully <brendan@kublai.com>
parents: 4482
diff changeset
53 % remove nonexistent tag
6321
55ba3bc5b8fd tag: allow multiple tags to be added or removed
John Coomes <john.coomes@sun.com>
parents: 5658
diff changeset
54 abort: tag 'foobar' does not exist
6671
938eddd76237 tag: record tag we're superseding, if any (issue 1102)
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
55 changeset: 5:1f98c77278de
4651
7176f278d6f9 Test attempt to remove nonexistent tag
Brendan Cully <brendan@kublai.com>
parents: 4482
diff changeset
56 tag: tip
7176f278d6f9 Test attempt to remove nonexistent tag
Brendan Cully <brendan@kublai.com>
parents: 4482
diff changeset
57 user: test
7176f278d6f9 Test attempt to remove nonexistent tag
Brendan Cully <brendan@kublai.com>
parents: 4482
diff changeset
58 date: Mon Jan 12 13:46:40 1970 +0000
7176f278d6f9 Test attempt to remove nonexistent tag
Brendan Cully <brendan@kublai.com>
parents: 4482
diff changeset
59 summary: Removed tag bar
7176f278d6f9 Test attempt to remove nonexistent tag
Brendan Cully <brendan@kublai.com>
parents: 4482
diff changeset
60
7814
4421abf8c85d tag: force load of tag cache
Matt Mackall <mpm@selenic.com>
parents: 6671
diff changeset
61 tip 5:e86d7ed95fd3
4266
fe7f38dda34b tags: fix abababa case, with test case
Matt Mackall <mpm@selenic.com>
parents: 4213
diff changeset
62 bar 0:b409d9da318e
fe7f38dda34b tags: fix abababa case, with test case
Matt Mackall <mpm@selenic.com>
parents: 4213
diff changeset
63 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6321
diff changeset
64 created new head
7814
4421abf8c85d tag: force load of tag cache
Matt Mackall <mpm@selenic.com>
parents: 6671
diff changeset
65 tip 6:b744fbe1f6dd
4266
fe7f38dda34b tags: fix abababa case, with test case
Matt Mackall <mpm@selenic.com>
parents: 4213
diff changeset
66 bar 0:b409d9da318e
6321
55ba3bc5b8fd tag: allow multiple tags to be added or removed
John Coomes <john.coomes@sun.com>
parents: 5658
diff changeset
67 abort: tag 'bar' already exists (use -f to force)
7814
4421abf8c85d tag: force load of tag cache
Matt Mackall <mpm@selenic.com>
parents: 6671
diff changeset
68 tip 6:b744fbe1f6dd
4267
8185a1ca8628 tags: require -f to replace an existing tag
Matt Mackall <mpm@selenic.com>
parents: 4266
diff changeset
69 bar 0:b409d9da318e
4482
99f411ba0380 use .extend instead of .append in readtags
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4267
diff changeset
70 adding foo
7814
4421abf8c85d tag: force load of tag cache
Matt Mackall <mpm@selenic.com>
parents: 6671
diff changeset
71 tip 3:197c21bbbf2c
4421abf8c85d tag: force load of tag cache
Matt Mackall <mpm@selenic.com>
parents: 6671
diff changeset
72 bar 2:6fa450212aeb
4482
99f411ba0380 use .extend instead of .append in readtags
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4267
diff changeset
73 % bar should still point to rev 2
7814
4421abf8c85d tag: force load of tag cache
Matt Mackall <mpm@selenic.com>
parents: 6671
diff changeset
74 tip 4:3b4b14ed0202
4421abf8c85d tag: force load of tag cache
Matt Mackall <mpm@selenic.com>
parents: 6671
diff changeset
75 bar 2:6fa450212aeb
5657
47915bf68c44 Properly check tag's existence as a local/global tag when removing it.
Osku Salerma <osku@iki.fi>
parents: 4662
diff changeset
76 adding foo
6321
55ba3bc5b8fd tag: allow multiple tags to be added or removed
John Coomes <john.coomes@sun.com>
parents: 5658
diff changeset
77 abort: tag 'localtag' is not a global tag
55ba3bc5b8fd tag: allow multiple tags to be added or removed
John Coomes <john.coomes@sun.com>
parents: 5658
diff changeset
78 abort: tag 'globaltag' is not a local tag
5658
ae3089cefaab Add --verbose support to tags command.
Osku Salerma <osku@iki.fi>
parents: 5657
diff changeset
79 tip 1:a0b6fe111088
ae3089cefaab Add --verbose support to tags command.
Osku Salerma <osku@iki.fi>
parents: 5657
diff changeset
80 localtag 0:bbd179dfa0a7 local
ae3089cefaab Add --verbose support to tags command.
Osku Salerma <osku@iki.fi>
parents: 5657
diff changeset
81 globaltag 0:bbd179dfa0a7