Mercurial > hg
view tests/test-archive-symlinks.t @ 18698:f2b1f78cf202 stable
mergetools: vimdiff issue a warning explaining how to abort
Adds a message displayed at each vimdiff invocation:
merge conflict detected, type ":cq" to abort
Vimdiff is very confusing for non-vim user (not to speak about vim user confused
anyway. However it is very likely that vimdiff is picked as the mergetool of
choice when using the default config:
- vim is available on all UNIX system.
- Its one of the rare non graphical merge tools.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Fri, 15 Feb 2013 11:28:04 +0100 |
parents | f2719b387380 |
children | 6d632cf8a811 |
line wrap: on
line source
$ "$TESTDIR/hghave" symlink || exit 80 $ 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 $ "$TESTDIR/readlink.py" dangling dangling -> nothing tar $ cd "$origdir" $ tar xf archive.tar $ cd tar $ "$TESTDIR/readlink.py" dangling dangling -> nothing zip $ cd "$origdir" $ unzip archive.zip > /dev/null $ cd zip $ "$TESTDIR/readlink.py" dangling dangling -> nothing $ cd ..