Mercurial > hg
view tests/test-rebase-check-restore @ 8684:5bb7780b57c7
match: fold plan cases down to two special cases
- merge always and match with patterns
- make always and match with patterns the default
- invert dostep3 to skipstep3
- move dirignore test inside exact case
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 31 May 2009 17:54:18 -0500 |
parents | 8766fee6f225 |
children | b345b1cc124f |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "graphlog=" >> $HGRCPATH echo "rebase=" >> $HGRCPATH BASE=`pwd` addcommit () { echo $1 > $1 hg add $1 hg commit -d "${2} 0" -m $1 } commit () { hg commit -d "${2} 0" -m $1 } createrepo () { cd $BASE rm -rf a hg init a cd a addcommit "A" 0 addcommit "B" 1 echo "C" >> A commit "C" 2 hg update -C 0 echo "D" >> A commit "D" 3 addcommit "E" 4 hg update -C 0 hg branch 'notdefault' echo "F" >> A commit "F" 5 } echo echo "% - Rebasing B onto E - check keep" createrepo > /dev/null 2>&1 hg glog --template '{rev}:{desc}:{branches}\n' hg rebase -s 1 -d 4 --keep 2>&1 | sed 's/\(saving bundle to \).*/\1/' echo echo "% - Solve the conflict and go on" echo 'conflict solved' > A rm A.orig hg resolve -m A hg rebase --continue 2>&1 | sed 's/\(saving bundle to \).*/\1/' hg glog --template '{rev}:{desc}:{branches}\n' echo echo "% - Rebase F onto E - check keepbranches" createrepo > /dev/null 2>&1 hg glog --template '{rev}:{desc}:{branches}\n' hg rebase -s 5 -d 4 --keepbranches 2>&1 | sed 's/\(saving bundle to \).*/\1/' echo echo "% - Solve the conflict and go on" echo 'conflict solved' > A rm A.orig hg resolve -m A hg rebase --continue 2>&1 | sed 's/\(saving bundle to \).*/\1/' hg glog --template '{rev}:{desc}:{branches}\n' exit 0