##// END OF EJS Templates
update: teach hg to override untracked dir with a tracked file on update...
update: teach hg to override untracked dir with a tracked file on update This is a fix to an old problem when Mercurial got confused by an untracked folder with the same name as one of the files in a commit hg was trying to update to. It is pretty safe to remove this folder if it is empty. Backing up an empty folder seems to go against Mercurial's "don't track dirs" philosophy.

File last commit:

r25472:4d2b9b30 default
r29480:1e4512ea default
Show More
test-archive-symlinks.t
40 lines | 643 B | text/troff | Tads3Lexer
/ tests / test-archive-symlinks.t
Matt Mackall
tests: replace exit 80 with #require
r22046 #require symlink
Martin Geisler
tests: unify test-archive-symlinks
r11854
$ origdir=`pwd`
$ hg init repo
$ cd repo
$ ln -s nothing dangling
avoid tar warnings about old timestamp
$ hg ci -d '2000-01-01 00:00:00 +0000' -qAm 'add symlink'
$ hg archive -t files ../archive
$ hg archive -t tar -p tar ../archive.tar
$ hg archive -t zip -p zip ../archive.zip
files
$ cd "$origdir"
$ cd archive
Matt Mackall
tests: drop explicit $TESTDIR from executables...
r25472 $ readlink.py dangling
Martin Geisler
tests: unify test-archive-symlinks
r11854 dangling -> nothing
tar
$ cd "$origdir"
$ tar xf archive.tar
$ cd tar
Matt Mackall
tests: drop explicit $TESTDIR from executables...
r25472 $ readlink.py dangling
Martin Geisler
tests: unify test-archive-symlinks
r11854 dangling -> nothing
zip
$ cd "$origdir"
Matt Mackall
tests: suppress spurious lchmod error from unzip (issue4088)...
r21216 $ unzip archive.zip > /dev/null 2>&1
Martin Geisler
tests: unify test-archive-symlinks
r11854 $ cd zip
Matt Mackall
tests: drop explicit $TESTDIR from executables...
r25472 $ readlink.py dangling
Martin Geisler
tests: unify test-archive-symlinks
r11854 dangling -> nothing
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..