Mercurial > hg
view tests/test-rebase-pull @ 7142:88f1b8081f1c
Prevent import over an applied patch (closes issue795)
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Sat, 18 Oct 2008 13:22:29 -0700 |
parents | 93609576244e |
children | 92455c1d6f83 |
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" -u test -m $1 } commit () { hg commit -d "${2} 0" -u test -m $1 } cd $BASE rm -rf a hg init a cd a addcommit "C1" 0 addcommit "C2" 1 cd .. hg clone a b cd b addcommit "L1" 2 cd ../a addcommit "R1" 3 cd ../b echo echo "% Now b has one revision to be pulled from a" hg pull --rebase 2>&1 | sed -e 's/\(saving bundle to \).*/\1/' \ -e 's/\(pulling from \).*/\1/' hg glog --template '{rev}:{desc}\n' echo echo "% Re-run pull --rebase" hg pull --rebase 2>&1 | sed 's/\(pulling from \).*/\1/' echo echo "% Invoke pull --rebase with --update" hg pull --rebase --update exit 0