Mercurial > hg
view tests/test-rebase-mq-skip @ 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 # This emulates the effects of an hg pull --rebase in which the remote repo # already has one local mq patch echo "[extensions]" >> $HGRCPATH echo "graphlog=" >> $HGRCPATH echo "rebase=" >> $HGRCPATH echo "mq=" >> $HGRCPATH hg init a cd a hg qinit -c # This must work even with a managed mq queue echo 'c1' > c1 hg add c1 hg commit -d '0 0' -m "C1" echo 'r1' > r1 hg add r1 hg commit -d '1 0' -m "R1" hg up 0 hg qnew p0.patch echo 'p0' > p0 hg add p0 hg qref -m 'P0' hg qnew p1.patch echo 'p1' > p1 hg add p1 hg qref -m 'P1' hg export qtip > p1.patch echo echo '% "Mainstream" import p1.patch' hg up -C 1 hg import p1.patch rm p1.patch echo echo '% Rebase' hg up -C qtip hg rebase 2>&1 | sed -e 's/\(saving bundle to \).*/\1/' hg glog --template '{rev} {desc} tags: {tags}\n'