##// END OF EJS Templates
color: bring back colors with pager...
color: bring back colors with pager It's introduced by 3c368a1c962d, but missing in merge changeset at a890cc501501.

File last commit:

r11198:b345b1cc default
r11207:1d714c15 default
Show More
test-rebase-mq-skip
46 lines | 792 B | text/plain | TextLexer
/ tests / test-rebase-mq-skip
Stefano Tortarolo
Add rebase extension
r6906 #!/bin/sh
# This emulates the effects of an hg pull --rebase in which the remote repo
# already has one local mq patch
Matt Mackall
rebase: use helpers.sh in tests
r11198 source $TESTDIR/helpers.sh
Stefano Tortarolo
Add rebase extension
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
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '0 0' -m "C1"
Stefano Tortarolo
Add rebase extension
r6906
echo 'r1' > r1
hg add r1
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '1 0' -m "R1"
Stefano Tortarolo
Add rebase extension
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
Matt Mackall
rebase: use helpers.sh in tests
r11198 hg rebase | hidebackup
Stefano Tortarolo
Add rebase extension
r6906 hg glog --template '{rev} {desc} tags: {tags}\n'