Mercurial > hg
view tests/test-tags.out @ 5378:8a2915f57dfc
convert: add a mode where mercurial_sink skips empty revisions.
The getchanges function of some converter_source classes can return
some false positives. I.e. they sometimes claim that a file "foo"
was changed in some revision, even though its contents are still the
same.
convert_svn is particularly bad, but I think this can also happen with
convert_cvs and, at least in theory, with mercurial_source.
For regular conversions this is not really a problem - as long as
getfile returns the right contents, we'll get a converted revision
with the right contents. But when we use --filemap, this could lead
to superfluous revisions being converted.
Instead of fixing every converter_source, I decided to change
mercurial_sink to work around this problem.
When --filemap is used, we're interested only in revisions that touch
some specific files. If a revision doesn't change any of these files,
then we're not interested in it (at least for revisions with a single
parent; merges are special).
For mercurial_sink, we abuse this property and rollback a commit if
the manifest text hasn't changed. This avoids duplicating the logic
from localrepo.filecommit to detect unchanged files.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Thu, 04 Oct 2007 23:21:37 -0300 |
parents | f9b8ea362b49 |
children | 47915bf68c44 |
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