Mercurial > hg
view tests/test-bookmarks-rebase @ 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 | 8766fee6f225 |
children | b345b1cc124f |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "rebase=" >> $HGRCPATH echo "bookmarks=" >> $HGRCPATH cleanoutput () { sed -e 's/\(Rebase status stored to\).*/\1/' \ -e 's/\(Rebase status restored from\).*/\1/' \ -e 's/\(saving bundle to \).*/\1/' } echo % initialize repository hg init echo 'a' > a hg ci -A -m "0" echo 'b' > b hg ci -A -m "1" hg up 0 echo 'c' > c hg ci -A -m "2" echo 'd' > d hg ci -A -m "3" hg bookmark -r 1 one hg bookmark -r 3 two echo % bookmark list hg bookmark echo % rebase hg rebase -s two -d one 2>&1 | cleanoutput hg log