Mercurial > hg
view tests/test-convert-splicemap @ 11322:3d6915f5a2bb
improve --branch processing (and differentiate from # syntax)
Previously #foo and --branch foo were handled identically.
The behavior of #foo hasn't changed, but --branch now works like this:
1) If branchmap is not supported on the remote, the operation fails.
2) If branch is '.', substitute with branch of the working dir parent.
3) If branch exists remotely, its heads are expanded.
4) Otherwise, the operation fails.
Tests have been added for the new cases.
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Thu, 10 Jun 2010 12:46:09 +0200 |
parents | bb5ea66789e3 |
children |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "convert=" >> $HGRCPATH echo '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