Mercurial > hg
diff tests/test-convert-splicemap @ 8047:04c62275cbc7
convert: better mapfile parsing errors (issue1581/1)
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sat, 11 Apr 2009 21:15:27 +0200 |
parents | |
children | 5b7da468531b |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-convert-splicemap Sat Apr 11 21:15:27 2009 +0200 @@ -0,0 +1,51 @@ +#!/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