Mercurial > hg
view tests/test-rebase-abort @ 11202:f974fe896921
strip: hide unbundle messages by default
Unbundling is an internal implementation detail for strip, only show
them with --verbose.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 20 May 2010 13:27:28 -0500 |
parents | b345b1cc124f |
children | 2313dc4d9817 |
line wrap: on
line source
#!/bin/sh source $TESTDIR/helpers.sh echo "[extensions]" >> $HGRCPATH echo "graphlog=" >> $HGRCPATH echo "rebase=" >> $HGRCPATH hg init a cd a echo 'c1' >common hg add common hg commit -d '0 0' -m "C1" echo 'c2' >>common hg commit -d '1 0' -m "C2" echo 'c3' >>common hg commit -d '2 0' -m "C3" hg update -C 1 echo 'l1' >>extra hg add extra hg commit -d '3 0' -m "L1" sed -e 's/c2/l2/' common > common.new mv common.new common hg commit -d '4 0' -m "L2" hg glog --template '{rev}: {desc}\n' echo echo '% Conflicting rebase' hg rebase -s 3 -d 2 | cleanrebase echo echo '% Abort' hg rebase --abort | cleanrebase hg glog --template '{rev}: {desc}\n'