Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-symlinks @ 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 | 35d47b06d4e3 |
children |
line wrap: on
line source
#!/bin/sh #Test bug regarding symlinks that showed up in hg 0.7 #Author: Matthew Elder <sseses@gmail.com> "$TESTDIR/hghave" symlink || exit 80 #make and initialize repo hg init test; cd test; #make a file and a symlink touch foo; ln -s foo bar; #import with addremove -- symlink walking should _not_ screwup. hg addremove #commit -- the symlink should _not_ appear added to dir state hg commit -m 'initial' #add a new file so hg will let me commit again touch bomb #again, symlink should _not_ show up on dir state hg addremove #Assert screamed here before, should go by without consequence hg commit -m 'is there a bug?' cd .. ; rm -r test hg init test; cd test; mkdir dir touch a.c dir/a.o dir/b.o # test what happens if we want to trick hg hg commit -A -m 0 echo "relglob:*.o" > .hgignore rm a.c rm dir/a.o rm dir/b.o mkdir dir/a.o ln -s nonexist dir/b.o mkfifo a.c # it should show a.c, dir/a.o and dir/b.o deleted hg status hg status a.c echo '# test absolute path through symlink outside repo' cd .. p=`pwd` hg init x ln -s x y cd x touch f hg add f hg status $p/y/f echo '# try symlink outside repo to file inside' ln -s x/f ../z # this should fail hg status ../z && { echo hg mistakenly exited with status 0; exit 1; } || : cd .. ; rm -r test hg init test; cd test; echo '# try cloning symlink in a subdir' echo '1. commit a symlink' mkdir -p a/b/c cd a/b/c ln -s /path/to/symlink/source demo cd ../../.. hg stat hg commit -A -m 'add symlink in a/b/c subdir' echo '2. clone it' cd .. hg clone test testclone echo '# git symlink diff' cd testclone hg diff --git -r null:tip hg export --git tip > ../sl.diff echo '# import git symlink diff' hg rm a/b/c/demo hg commit -m'remove link' hg import ../sl.diff hg diff --git -r 1:tip