Mercurial > hg
view tests/test-bookmarks-strip @ 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.
author | Stuart W Marks <smarks@smarks.org> |
---|---|
date | Thu, 05 Nov 2009 10:53:59 +0100 |
parents | 9737041646bc |
children | 12e5149cafca |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "bookmarks=" >> $HGRCPATH echo "mq=" >> $HGRCPATH hg init echo qqq>qqq.txt echo % add file hg add echo % commit first revision hg ci -m 1 -u user -d "1 0" echo % set bookmark hg book test echo www>>qqq.txt echo % commit second revision hg ci -m 2 -u usr -d "1 0" echo % set bookmark hg book test2 echo % update to -2 hg update -r -2 echo eee>>qqq.txt echo % commit new head hg ci -m 3 -u user -d "1 0" echo % bookmarks updated? hg book echo % strip to revision 1 hg strip 1 2>&1 | sed 's/\(saving bundle to \).*/\1/' echo % list bookmarks hg book