Mercurial > hg
view tests/test-convert-splicemap @ 9717:68a1b9d0663e
update: allow branch crossing without -c or -C, with no uncommitted changes
Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches. Minor change to abort message if
uncommitted changes are found.
Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.
author | Stuart W Marks <smarks@smarks.org> |
---|---|
date | Thu, 05 Nov 2009 10:53:59 +0100 |
parents | 5b7da468531b |
children | bb5ea66789e3 |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "convert=" >> $HGRCPATH echo 'hgext.graphlog =' >> $HGRCPATH glog() { hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@" } hg init repo1 cd repo1 echo a > a hg ci -Am adda echo b > b echo a >> a hg ci -Am addb PARENTID1=`hg id --debug -i` echo c > c hg ci -Am addc PARENTID2=`hg id --debug -i` cd .. hg init repo2 cd repo2 echo b > a echo d > d hg ci -Am addaandd CHILDID1=`hg id --debug -i` echo d >> d hg ci -Am changed CHILDID2=`hg id --debug -i` echo e > e hg ci -Am adde cd .. echo '% test invalid splicemap' cat > splicemap <<EOF $CHILDID2 EOF hg convert --splicemap splicemap repo2 repo1 echo '% splice repo2 on repo1' cat > splicemap <<EOF $CHILDID1 $PARENTID1 $CHILDID2 $PARENTID2,$CHILDID1 EOF hg clone repo1 target1 hg convert --splicemap splicemap repo2 target1 glog -R target1