Mercurial > hg
annotate tests/test-tags.out @ 3099:09e8aecd8016
Merge with backout
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 15 Sep 2006 16:01:16 -0500 |
parents | eef469259745 |
children | baa271270829 |
rev | line source |
---|---|
345 | 1 unknown |
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 |
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
|
4 0acdaf8983679e0aac16e811534eb49d7ee1f2b4 first |
2966
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2320
diff
changeset
|
5 tip 1:8a3ca90d111d |
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2320
diff
changeset
|
6 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
|
7 8a3ca90d111d tip |
748 | 8 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
|
9 8a3ca90d111d+ tip |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1986
diff
changeset
|
10 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
|
11 0acdaf898367+ first |
2966
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2320
diff
changeset
|
12 0acdaf898367+ first |
748 | 13 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
|
14 8216907a933d tip |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1986
diff
changeset
|
15 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
|
16 (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
|
17 8216907a933d+8a3ca90d111d+ tip |
993 | 18 M .hgtags |
2967
eef469259745
tag: shorten hash in default commit message
Matt Mackall <mpm@selenic.com>
parents:
2966
diff
changeset
|
19 tip 6:e2174d339386 |
2966
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2320
diff
changeset
|
20 first 0:0acdaf898367 |
2967
eef469259745
tag: shorten hash in default commit message
Matt Mackall <mpm@selenic.com>
parents:
2966
diff
changeset
|
21 .hgtags (rev 7:c071f74ab5eb), line 2: cannot parse entry |
eef469259745
tag: shorten hash in default commit message
Matt Mackall <mpm@selenic.com>
parents:
2966
diff
changeset
|
22 .hgtags (rev 7:c071f74ab5eb), line 4: node 'foo' 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
|
23 localtags, line 1: tag 'invalid' refers to unknown node |
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 |
2967
eef469259745
tag: shorten hash in default commit message
Matt Mackall <mpm@selenic.com>
parents:
2966
diff
changeset
|
25 .hgtags (rev 7:c071f74ab5eb), line 2: cannot parse entry |
eef469259745
tag: shorten hash in default commit message
Matt Mackall <mpm@selenic.com>
parents:
2966
diff
changeset
|
26 .hgtags (rev 7:c071f74ab5eb), line 4: node 'foo' 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 .hgtags (rev 8:4ca6f1b1a68c), line 2: node 'x' is not well formed |
dbdce3b99988
fix parsing of tags. make parse errors useful. add new tag tests.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
28 localtags, line 1: tag 'invalid' refers to unknown node |
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 |
2967
eef469259745
tag: shorten hash in default commit message
Matt Mackall <mpm@selenic.com>
parents:
2966
diff
changeset
|
32 .hgtags (rev 7:c071f74ab5eb), line 2: cannot parse entry |
eef469259745
tag: shorten hash in default commit message
Matt Mackall <mpm@selenic.com>
parents:
2966
diff
changeset
|
33 .hgtags (rev 7:c071f74ab5eb), line 4: node 'foo' 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 .hgtags (rev 8:4ca6f1b1a68c), line 2: node 'x' is not well formed |
dbdce3b99988
fix parsing of tags. make parse errors useful. add new tag tests.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
35 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
|
36 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
|
37 parent: 3:b2ef3841386b |
1986
719cf07b076d
add checking for invalid entries in tag files
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1933
diff
changeset
|
38 user: test |
719cf07b076d
add checking for invalid entries in tag files
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1933
diff
changeset
|
39 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
|
40 summary: head |
1986
719cf07b076d
add checking for invalid entries in tag files
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1933
diff
changeset
|
41 |