annotate tests/test-mq-qsave @ 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 61fcd9fac434
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2806
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
1 #!/bin/sh
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
2
2976
61fcd9fac434 Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2809
diff changeset
3 echo "[extensions]" >> $HGRCPATH
61fcd9fac434 Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2809
diff changeset
4 echo "mq=" >> $HGRCPATH
2806
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
5
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
6 hg init a
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
7 cd a
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
8
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
9 echo 'base' > base
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
10 hg ci -Ambase -d '1 0'
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
11
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
12 hg qnew -mmqbase mqbase
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
13
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
14 hg qsave
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
15 hg qrestore 2