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

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

record: check that we are not committing a merge before patch selection...
record: check that we are not committing a merge before patch selection It might sound like a good idea to use record to filter changes when merging. If someone attemps this, it's better to tell her "no" right ahead, before the patch generation/line selection, so she does not spend time doing it just to receive a red light after that (sometimes rather long) process.
Yuya Nishihara - - Load All Authors

File last commit:

r11208:2313dc4d default
r11237:feb2a58f stable
Show More
test-rebase-newancestor
31 lines | 514 B | text/plain | TextLexer
/ tests / test-rebase-newancestor
History | Annotation | Raw |Copy content |Copy permalink
#!/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