Mercurial > hg
view tests/test-no-symlinks @ 12765:5eed9ceebd64
merge: when --tool is specified, disable HGMERGE by setting to empty string
HGMERGE has different semantics than ui.merge. HGMERGE should hold the name
on an executable in your path, or an absolute tool path. As such, it's not
safe to simply copy the user's specified --tool value into HGMERGE. Instead,
we disable HGMERGE by setting it to an empty string.
author | Steve Borho <steve@borho.org> |
---|---|
date | Mon, 18 Oct 2010 23:20:14 -0500 |
parents | fc6106267198 |
children |
line wrap: on
line source
#!/bin/sh "$TESTDIR/hghave" no-symlink || exit 80 # The following script was used to create the bundle: # # hg init symlinks # cd symlinks # echo a > a # mkdir d # echo b > d/b # ln -s a a.lnk # ln -s d/b d/b.lnk # hg ci -Am t # hg bundle --base null ../test-no-symlinks.hg # Extract a symlink on a platform not supporting them echo % unbundle hg init t cd t hg pull -q "$TESTDIR/test-no-symlinks.hg" hg update cat a.lnk && echo cat d/b.lnk && echo # Copy a symlink and move another echo % move and copy hg copy a.lnk d/a2.lnk hg mv d/b.lnk b2.lnk hg ci -Am copy cat d/a2.lnk && echo cat b2.lnk && echo # Bundle and extract again echo % bundle hg bundle --base null ../symlinks.hg cd .. hg init t2 cd t2 hg pull ../symlinks.hg hg update cat a.lnk && echo cat d/a2.lnk && echo cat b2.lnk && echo