annotate tests/test-copy @ 5192:33015dac5df5

convert: fix mercurial_sink.putcommit Changeset 4ebc8693ce72 added some code to putcommit to avoid creating a revision that touches no files, but this can break regular conversions from some repositories: - conceptually, since we're converting a repo, we should try to make the new hg repo as similar as possible to the original repo - we should create a new changeset, even if the original revision didn't touch any files (maybe the commit message had some important bit); - even if a "regular" revision that doesn't touch any file may seem weird (and maybe even broken), it's completely legitimate for a merge revision to not touch any file, and, if we just skip it, the converted repo will end up with wrong history and possibly an extra head. As an example, say the crew and main hg repos are sync'ed. Somebody sends an important patch to the mailing list. Matt quickly applies and pushes it. But at the same time somebody also applies it to crew and pushes it. Suppose the commit message ended up being a bit different (say, there was a typo and somebody didn't fix it) or that the date ended up being different (because of different patch-applying scripts): the changeset hashes will be different, but the manifests will be the same. Since both changesets were pushed to public repos, it's hard to recall them. If both are merged, the manifest from the resulting merge revision will have the exact same contents as its parents - i.e. the merge revision really doesn't touch any file at all. To keep the file filtering stuff "working", the generic code was changed to skip empty revisions if we're filtering the repo, fixing a bug in the process (we want parents[0] instead of tip).
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 17 Aug 2007 20:18:05 -0300
parents c0b449154a90
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
544
3d4d5f2aba9a Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 464
diff changeset
1 #!/bin/sh
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
2
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
3 hg init
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
4 echo a > a
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
5 hg add a
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1926
diff changeset
6 hg commit -m "1" -d "1000000 0"
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
7 hg status
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
8 hg copy a b
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
9 hg status
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1926
diff changeset
10 hg --debug commit -m "2" -d "1000000 0"
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 814
diff changeset
11 echo "we should see two history entries"
9344f5dd4488 Update tests
mpm@selenic.com
parents: 814
diff changeset
12 hg history -v
9344f5dd4488 Update tests
mpm@selenic.com
parents: 814
diff changeset
13 echo "we should see one log entry for a"
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
14 hg log a
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 814
diff changeset
15 echo "this should show a revision linked to changeset 0"
3853
c0b449154a90 switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2223
diff changeset
16 hg debugindex .hg/store/data/a.i
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 814
diff changeset
17 echo "we should see one log entry for b"
9344f5dd4488 Update tests
mpm@selenic.com
parents: 814
diff changeset
18 hg log b
9344f5dd4488 Update tests
mpm@selenic.com
parents: 814
diff changeset
19 echo "this should show a revision linked to changeset 1"
3853
c0b449154a90 switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2223
diff changeset
20 hg debugindex .hg/store/data/b.i
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 814
diff changeset
21
9344f5dd4488 Update tests
mpm@selenic.com
parents: 814
diff changeset
22 echo "this should show the rename information in the metadata"
3853
c0b449154a90 switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2223
diff changeset
23 hg debugdata .hg/store/data/b.d 0 | head -3 | tail -2
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 814
diff changeset
24
3853
c0b449154a90 switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2223
diff changeset
25 $TESTDIR/md5sum.py .hg/store/data/b.i
462
512d76558bd4 Fix pipe timing for copy test
mpm@selenic.com
parents: 363
diff changeset
26 hg cat b > bsum
1923
7d83a351a936 fix testsuite for freebsd and one timingissue
Peter van Dijk <peter@dataloss.nl>
parents: 1252
diff changeset
27 $TESTDIR/md5sum.py bsum
462
512d76558bd4 Fix pipe timing for copy test
mpm@selenic.com
parents: 363
diff changeset
28 hg cat a > asum
1923
7d83a351a936 fix testsuite for freebsd and one timingissue
Peter van Dijk <peter@dataloss.nl>
parents: 1252
diff changeset
29 $TESTDIR/md5sum.py asum
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
30 hg verify