Mercurial > hg
view tests/test-tags.out @ 3400:d2b55e3c4e25
merge: if filemerge skips merge, report as updated
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 15 Oct 2006 16:18:09 -0500 |
parents | eef469259745 |
children | baa271270829 |
line wrap: on
line source
unknown 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0acdaf898367 tip 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 .hgtags (rev 7:c071f74ab5eb), line 2: cannot parse entry .hgtags (rev 7:c071f74ab5eb), line 4: node 'foo' is not well formed localtags, line 1: tag 'invalid' refers to unknown node 1 files updated, 0 files merged, 0 files removed, 0 files unresolved .hgtags (rev 7:c071f74ab5eb), line 2: cannot parse entry .hgtags (rev 7:c071f74ab5eb), line 4: node 'foo' is not well formed .hgtags (rev 8: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 (rev 7:c071f74ab5eb), line 2: cannot parse entry .hgtags (rev 7:c071f74ab5eb), line 4: node 'foo' is not well formed .hgtags (rev 8: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