comparison tests/test-tags.out @ 2324:7cbe8cd69d6b

merge with crew.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 19 May 2006 08:57:12 -0700
parents dbdce3b99988
children fb493241d7f6
comparison
equal deleted inserted replaced
2323:c58a403aa830 2324:7cbe8cd69d6b
14 8216907a933d tip 14 8216907a933d tip
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
16 (branch merge, don't forget to commit) 16 (branch merge, don't forget to commit)
17 8216907a933d+8a3ca90d111d+ tip 17 8216907a933d+8a3ca90d111d+ tip
18 M .hgtags 18 M .hgtags
19 .hgtags:2: ignoring invalid tag 19 tip 6:c6af9d771a81bb9c7f267ec03491224a9f8ba1cd
20 .hgtags:4: ignoring invalid tag
21 localtags:1: ignoring invalid tag
22 tip 4:fd868a874787a7b5af31e1675666ce691c803035
23 first 0:0acdaf8983679e0aac16e811534eb49d7ee1f2b4 20 first 0:0acdaf8983679e0aac16e811534eb49d7ee1f2b4
24 changeset: 4:fd868a874787 21 .hgtags (rev 7:39bba1bbbc4c), line 2: cannot parse entry
25 .hgtags:2: ignoring invalid tag 22 .hgtags (rev 7:39bba1bbbc4c), line 4: node 'foo' is not well formed
26 .hgtags:4: ignoring invalid tag 23 localtags, line 1: tag 'invalid' refers to unknown node
27 localtags:1: ignoring invalid tag 24 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
25 .hgtags (rev 7:39bba1bbbc4c), line 2: cannot parse entry
26 .hgtags (rev 7:39bba1bbbc4c), line 4: node 'foo' is not well formed
27 .hgtags (rev 8:4ca6f1b1a68c), line 2: node 'x' is not well formed
28 localtags, line 1: tag 'invalid' refers to unknown node
29 tip 8:4ca6f1b1a68c77be687a03aaeb1614671ba59b20
30 first 0:0acdaf8983679e0aac16e811534eb49d7ee1f2b4
31 changeset: 8:4ca6f1b1a68c
32 .hgtags (rev 7:39bba1bbbc4c), line 2: cannot parse entry
33 .hgtags (rev 7:39bba1bbbc4c), line 4: node 'foo' is not well formed
34 .hgtags (rev 8:4ca6f1b1a68c), line 2: node 'x' is not well formed
35 localtags, line 1: tag 'invalid' refers to unknown node
28 tag: tip 36 tag: tip
37 parent: 3:b2ef3841386b
29 user: test 38 user: test
30 date: Mon Jan 12 13:46:40 1970 +0000 39 date: Mon Jan 12 13:46:40 1970 +0000
31 summary: tags 40 summary: head
32 41