Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-pull-pull-corruption2 @ 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 | d181845bdc51 |
children |
rev | line source |
---|---|
2000
6f6e210b38cf
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
1 #!/bin/sh |
6f6e210b38cf
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
2 # |
6f6e210b38cf
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
3 # Corrupt an hg repo with two pulls. |
6f6e210b38cf
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
4 # |
6f6e210b38cf
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
5 |
6f6e210b38cf
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
6 # create one repo with a long history |
6f6e210b38cf
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
7 hg init source1 |
6f6e210b38cf
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
8 cd source1 |
6f6e210b38cf
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
9 touch foo |
6f6e210b38cf
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
10 hg add foo |
6f6e210b38cf
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
11 for i in 1 2 3 4 5 6 7 8 9 10; do |
6f6e210b38cf
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
12 echo $i >> foo |
6f6e210b38cf
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
13 hg ci -m $i |
6f6e210b38cf
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
14 done |
6f6e210b38cf
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
15 cd .. |
6f6e210b38cf
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
16 |
6f6e210b38cf
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
17 # create a third repo to pull both other repos into it |
6f6e210b38cf
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
18 hg init version2 |
6f6e210b38cf
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
19 hg -R version2 pull source1 & |
6f6e210b38cf
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
20 sleep 1 |
6f6e210b38cf
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
21 |
6f6e210b38cf
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
22 hg clone --pull -U version2 corrupted |
2530
d181845bdc51
Wait for first pull to be completed before doing verify.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2000
diff
changeset
|
23 wait |
2000
6f6e210b38cf
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
24 hg -R corrupted verify |
6f6e210b38cf
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
25 hg -R version2 verify |