Mercurial > hg
view tests/test-rebase-conflicts @ 7138:0df098871e3d
test-permission: put sane permissions at the end of the test
If we don't do that, we won't delete all directories at the end of the test
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sat, 18 Oct 2008 20:47:47 +0200 |
parents | 93609576244e |
children | 45495d784ad6 |
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 '% Try to call --continue' hg rebase --continue echo echo '% Conflicting rebase' hg rebase -s 3 -d 2 echo echo '% Try to continue without solving the conflict' hg rebase --continue echo echo '% Conclude rebase' echo 'solved merge' >common hg resolve -m common hg rebase --continue 2>&1 | cleanoutput hg glog --template '{rev}: {desc}\n'