Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-walk @ 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 | d4f0405fadac |
| children |
line wrap: on
line source
#!/bin/sh debugwalk() { echo "hg debugwalk $@" hg debugwalk "$@" echo } chdir() { echo "cd $@" cd "$@" echo } mkdir t cd t hg init mkdir -p beans for b in kidney navy turtle borlotti black pinto; do echo $b > beans/$b done mkdir -p mammals/Procyonidae for m in cacomistle coatimundi raccoon; do echo $m > mammals/Procyonidae/$m done echo skunk > mammals/skunk echo fennel > fennel echo fenugreek > fenugreek echo fiddlehead > fiddlehead echo glob:glob > glob:glob hg addremove hg commit -m "commit #0" -d "1000000 0" debugwalk debugwalk -I. chdir mammals debugwalk debugwalk -X ../beans debugwalk -I '*k' debugwalk -I 'glob:*k' debugwalk -I 'relglob:*k' debugwalk -I 'relglob:*k' . debugwalk -I 're:.*k$' debugwalk -I 'relre:.*k$' debugwalk -I 'path:beans' debugwalk -I 'relpath:../beans' debugwalk . debugwalk -I. debugwalk Procyonidae chdir Procyonidae debugwalk . debugwalk .. chdir .. debugwalk ../beans debugwalk . debugwalk .hg debugwalk ../.hg chdir .. debugwalk -Ibeans debugwalk 'glob:mammals/../beans/b*' debugwalk '-X*/Procyonidae' mammals debugwalk path:mammals debugwalk .. debugwalk beans/../.. debugwalk .hg debugwalk beans/../.hg debugwalk beans/../.hg/data debugwalk beans/.hg # Don't know how to test absolute paths without always getting a false # error. #debugwalk `pwd`/beans #debugwalk `pwd`/.. debugwalk glob:\* debugwalk 'glob:**e' debugwalk 're:.*[kb]$' debugwalk path:beans/black debugwalk path:beans//black debugwalk relglob:Procyonidae debugwalk 'relglob:Procyonidae/**' debugwalk 'relglob:Procyonidae/**' fennel debugwalk beans 'glob:beans/*' debugwalk 'glob:mamm**' debugwalk 'glob:mamm**' fennel debugwalk 'glob:j*' debugwalk NOEXIST mkfifo fifo debugwalk fifo rm fenugreek debugwalk fenugreek hg rm fenugreek debugwalk fenugreek touch new debugwalk new chdir .. debugwalk -R t t/mammals/skunk mkdir t2 chdir t2 debugwalk -R ../t ../t/mammals/skunk debugwalk --cwd ../t mammals/skunk