view tests/test-bookmarks-current @ 9717:68a1b9d0663e

update: allow branch crossing without -c or -C, with no uncommitted changes

Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches.  Minor change to abort message if
uncommitted changes are found.

Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.

#!/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 % list bookmarks
hg bookmark

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

echo % delete bookmarks
hg bookmark -d Y
hg bookmark -d Z

echo % list bookmarks
hg bookmark

echo % update to tip
hg update tip