Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-tags.out @ 5149:ad6b97132b81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 f9b8ea362b49
children
line wrap: on
line source

000000000000 tip
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0acdaf898367 tip
tip                                0:0acdaf898367
This is a local tag with a really long name!     0:0acdaf898367
0acdaf8983679e0aac16e811534eb49d7ee1f2b4 first
tip                                1:8a3ca90d111d
first                              0:0acdaf898367
8a3ca90d111d tip
M a
8a3ca90d111d+ tip
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
0acdaf898367+ first
0acdaf898367+ first
M a
8216907a933d tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
8216907a933d+8a3ca90d111d+ tip
M .hgtags
tip                                6:e2174d339386
first                              0:0acdaf898367
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
.hgtags@c071f74ab5eb, line 2: cannot parse entry
.hgtags@c071f74ab5eb, line 4: node 'foo' is not well formed
.hgtags@4ca6f1b1a68c, line 2: node 'x' is not well formed
localtags, line 1: tag 'invalid' refers to unknown node
tip                                8:4ca6f1b1a68c
first                              0:0acdaf898367
changeset:   8:4ca6f1b1a68c
.hgtags@c071f74ab5eb, line 2: cannot parse entry
.hgtags@c071f74ab5eb, line 4: node 'foo' is not well formed
.hgtags@4ca6f1b1a68c, line 2: node 'x' is not well formed
localtags, line 1: tag 'invalid' refers to unknown node
tag:         tip
parent:      3:b2ef3841386b
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     head

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
tip                                4:36195b728445
bar                                1:b204a97e6e8d
changeset:   5:57e1983b4a60
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     Removed tag bar

tip                                5:57e1983b4a60
% remove nonexistent tag
abort: tag foobar does not exist
changeset:   5:57e1983b4a60
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     Removed tag bar

tip                                5:d8bb4d1eff25
bar                                0:b409d9da318e
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
tip                                6:b5ff9d142648
bar                                0:b409d9da318e
abort: a tag named bar already exists (use -f to force)
tip                                6:b5ff9d142648
bar                                0:b409d9da318e
adding foo
tip                                3:ca8479b4351c
bar                                2:72b852876a42
% bar should still point to rev 2
tip                                4:40af5d225513
bar                                2:72b852876a42