##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

convert/bzr: make it work with filemaps (issue1631)...
convert/bzr: make it work with filemaps (issue1631) The bzr converter maintains a child -> parents mapping and drop entries whenever a child is read. It does not work with filemaps, getchangedfiles() may be called more than once when filtered files belong to merge revisions. getchanges() still works that way but it is not clear whether a similar issue can arise when interacting with merges.
Brendan Cully - - Load All Authors

File last commit:

r6910:93609576 default
r8165:78658990 default
Show More
test-rebase-abort
44 lines | 851 B | text/plain | TextLexer
/ tests / test-rebase-abort
History | Annotation | Raw |Copy content |Copy permalink
#!/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'