Mercurial > hg
view tests/test-mq-safety @ 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 | 5b7da468531b |
children | bb5ea66789e3 |
line wrap: on
line source
#!/bin/sh echo '[extensions]' >> $HGRCPATH echo 'hgext.mq =' >> $HGRCPATH hg init repo cd repo echo foo > foo hg ci -qAm 'add a file' hg qinit hg qnew foo echo foo >> foo hg qrefresh -m 'append foo' hg qnew bar echo bar >> foo hg qrefresh -m 'append bar' echo '% try to commit on top of a patch' echo quux >> foo hg ci -m 'append quux' # cheat a bit... mv .hg/patches .hg/patches2 hg ci -m 'append quux' mv .hg/patches2 .hg/patches echo '% qpop/qrefresh on the wrong revision' hg qpop hg qpop -n patches 2>&1 | sed -e 's/\(using patch queue:\).*/\1/' hg qrefresh hg up -C qtip echo '% qpop' hg qpop echo '% qrefresh' hg qrefresh echo '% tip:' hg tip --template '{rev} {desc}\n'