annotate tests/test-empty-dir @ 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 33b6c8193652
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
578
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
1 #!/bin/sh
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
2
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
3 hg init
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
4 echo 123 > a
e33c85d2812a Remove empty directories on update
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 "first" -d "1000000 0" a
578
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
7 mkdir sub
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
8 echo 321 > sub/b
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
9 hg add sub/b
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 commit -m "second" -d "1000000 0" sub/b
578
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
11 cat sub/b
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
12 hg co 0
1926
ba198d17eea9 changes by John Levon to standardize some erroroutput
Peter van Dijk <peter@dataloss.nl>
parents: 814
diff changeset
13 cat sub/b 2>/dev/null || echo "sub/b not present"
3464
33b6c8193652 Don't use test -e in tests - sh doesn't like it on Solaris
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3418
diff changeset
14 test -d sub || echo "sub not present"
578
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
15
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
16 true