Mercurial > hg
view tests/test-rebase-abort @ 7329:fd4bf5269733
Do not abort with inotify extension enabled, but not supported by the system.
And remove the "native support is required" message which is generated at an
inappropriate location and is printed more than once when using 'hg status'.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 07 Nov 2008 13:02:04 +0100 |
parents | 93609576244e |
children | 8766fee6f225 |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "graphlog=" >> $HGRCPATH echo "rebase=" >> $HGRCPATH cleanoutput () { sed -e 's/\(Rebase status stored to\).*/\1/' \ -e 's/\(Rebase status restored from\).*/\1/' \ -e 's/\(saving bundle to \).*/\1/' } hg init a cd a echo 'c1' >common hg add common hg commit -d '0 0' -u test -m "C1" echo 'c2' >>common hg commit -d '1 0' -u test -m "C2" echo 'c3' >>common hg commit -d '2 0' -u test -m "C3" hg update -C 1 echo 'l1' >>extra hg add extra hg commit -d '3 0' -u test -m "L1" sed -e 's/c2/l2/' common > common.new mv common.new common hg commit -d '4 0' -u test -m "L2" hg glog --template '{rev}: {desc}\n' echo echo '% Conflicting rebase' hg rebase -s 3 -d 2 2>&1 | cleanoutput echo echo '% Abort' hg rebase --abort 2>&1 | cleanoutput hg glog --template '{rev}: {desc}\n'