##// END OF EJS Templates
patch: support diff data loss detection and upgrade...
patch: support diff data loss detection and upgrade In worst case, generating diff in upgrade mode can be two times more expensive than generating it in git mode directly: we may have to regenerate the whole diff again whenever a git feature is detected. Also, the first diff attempt is completely buffered instead of being streamed. That said, even without having profiled it yet, I am convinced we can fast-path the upgrade mode if necessary were it to be used in regular diff commands, and not only in mq where avoiding data loss is worth the price.

File last commit:

r9815:49efeed4 default
r10189:e451e599 default
Show More
test-rebase-newancestor
31 lines | 514 B | text/plain | TextLexer
/ tests / test-rebase-newancestor
Christian Boos
rebase: make sure the newancestor is used during the whole update...
r9815 #!/bin/sh
echo "[extensions]" >> $HGRCPATH
echo "graphlog=" >> $HGRCPATH
echo "rebase=" >> $HGRCPATH
rm -rf repo
hg init repo
cd repo
echo A > a
echo >> a
hg commit -AmA -u test -d '0 0'
echo B > a
echo >> a
hg commit -mB -u test -d '1 0'
echo C > a
echo >> a
hg commit -mC -u test -d '2 0'
hg up -C 0
echo D >> a
hg commit -AmAD -u test -d '3 0'
hg glog --template '{rev}:{desc} {node|short}\n'
hg rebase -q -s 1 -d 3 2>&1 | grep -v 'saving bundle'
hg glog --template '{rev}:{desc} {node|short}\n'
exit 0