test-rebase-mq-skip
46 lines
| 792 B
| text/plain
|
TextLexer
/ tests / test-rebase-mq-skip
|
r6906 | #!/bin/sh | ||
# This emulates the effects of an hg pull --rebase in which the remote repo | ||||
# already has one local mq patch | ||||
|
r11198 | source $TESTDIR/helpers.sh | ||
|
r6906 | 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 | ||||
|
r8168 | hg commit -d '0 0' -m "C1" | ||
|
r6906 | |||
echo 'r1' > r1 | ||||
hg add r1 | ||||
|
r8168 | hg commit -d '1 0' -m "R1" | ||
|
r6906 | |||
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 | ||||
|
r11198 | hg rebase | hidebackup | ||
|
r6906 | hg glog --template '{rev} {desc} tags: {tags}\n' | ||