view tests/test-bookmarks-current @ 7785:660c8dd44060

test-merge-tool: Make sure no hgmerge can be found in $PATH

The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH
before it falls back to use internal merge. This fixes the test for this
fallback to be tolerant to existing hgmerges.

#!/bin/sh

echo "[extensions]" >> $HGRCPATH
echo "bookmarks=" >> $HGRCPATH

echo "[bookmarks]" >> $HGRCPATH
echo "track.current = True" >> $HGRCPATH

hg init

echo % no bookmarks
hg bookmarks

echo % set bookmark X
hg bookmark X

echo % update to bookmark X
hg update X

echo % list bookmarks
hg bookmarks

echo % rename
hg bookmark -m X Z

echo % list bookmarks
hg bookmarks

echo % new bookmark Y
hg bookmark Y

echo % list bookmarks
hg bookmark

echo % commit
echo 'b' > b
hg add b
hg commit -m'test'

echo % list bookmarks
hg bookmark