Mercurial > hg
view tests/test-rebase-abort @ 11148:a912f26777d3
merge: introduce tool.check parameter
tool.check is a list of check options, and can be used in place of
tool.checkchanged and tool.checkconflicts:
Equivalences:
tool.checkchanged = yes
tool.checkconflicts = no
tool.check = changed
tool.checkchanged = no
tool.checkconflicts = yes
tool.check = conflicts
tool.checkchanged = yes
tool.checkconflicts = yes
tool.check = changed, conflicts
Add _toollist() wrapper for ui.configlist() to implement this consistently.
checkchanged and checkconflicts are still supported, but check is
preferred for implementing new check options.
author | David Champion <dgc@uchicago.edu> |
---|---|
date | Mon, 10 May 2010 11:04:56 -0500 |
parents | 8766fee6f225 |
children | b345b1cc124f |
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' -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 2>&1 | cleanoutput echo echo '% Abort' hg rebase --abort 2>&1 | cleanoutput hg glog --template '{rev}: {desc}\n'