Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-empty-group @ 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 | 7a7d4937272b |
children |
line wrap: on
line source
#!/bin/sh # # A B # # 3 4 3 # |\/| |\ # |/\| | \ # 1 2 1 2 # \ / \ / # 0 0 # # if the result of the merge of 1 and 2 # is the same in 3 and 4, no new manifest # will be created and the manifest group # will be empty during the pull # # (plus we test a failure where outgoing # wrongly reported the number of csets) # hg init a cd a touch init hg ci -A -m 0 -d "1000000 0" touch x y hg ci -A -m 1 -d "1000000 0" hg update 0 touch x y hg ci -A -m 2 -d "1000000 0" hg merge 1 hg ci -A -m m1 -d "1000000 0" #hg log #hg debugindex .hg/store/00manifest.i hg update -C 1 hg merge 2 hg ci -A -m m2 -d "1000000 0" #hg log #hg debugindex .hg/store/00manifest.i cd .. hg clone -r 3 a b hg clone -r 4 a c hg -R a outgoing b hg -R a outgoing c hg -R b outgoing c hg -R c outgoing b hg -R b pull a hg -R c pull a