Mercurial > hg
view tests/test-bookmarks-strip @ 9954:d6a307719ccb stable
fix bug in prepush logic involving merge changesets
When creating new branches and merging them into existing ones, you would
sometimes be able to push some changesets (the existing branches) without using
--force, even when that creates a new head on the remote.
A test which triggers the error has been added.
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Mon, 30 Nov 2009 14:58:52 +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