comparison tests/test-convert-hg-svn @ 10051:a02d43acbc04 stable

convert/svn: make sink recover gracefully from empty changeset Otherwise when processing a changeset that in fact changes no files (perhaps due to bug in import from CVS) can get something like: unexpected svn output: abort: unable to cope with svn output Bug report and patch draft by Jesse Glick <jesse.glick@sun.com>
author Patrick Mezard <pmezard@gmail.com>
date Mon, 07 Dec 2009 12:44:15 -0500
parents 34c4131abdf9
children c52057614c72
comparison
equal deleted inserted replaced
10048:46de82e50790 10051:a02d43acbc04
7 tr '\\' / 7 tr '\\' /
8 } 8 }
9 9
10 echo "[extensions]" >> $HGRCPATH 10 echo "[extensions]" >> $HGRCPATH
11 echo "convert = " >> $HGRCPATH 11 echo "convert = " >> $HGRCPATH
12 echo "mq = " >> $HGRCPATH
12 13
13 svnpath=`pwd | fix_path`/svn-repo 14 svnpath=`pwd | fix_path`/svn-repo
14 svnadmin create $svnpath 15 svnadmin create $svnpath
15 16
16 cat > $svnpath/hooks/pre-revprop-change <<'EOF' 17 cat > $svnpath/hooks/pre-revprop-change <<'EOF'
57 hg convert -s hg -d svn $svnpath-hg $svnpath-wc 58 hg convert -s hg -d svn $svnpath-hg $svnpath-wc
58 59
59 echo % new hg rev 60 echo % new hg rev
60 61
61 hg clone $svnpath-hg $svnpath-work 62 hg clone $svnpath-hg $svnpath-work
62 echo b > $svnpath-work/b 63 cd $svnpath-work
63 hg --cwd $svnpath-work add b 64 echo b > b
64 hg --cwd $svnpath-work ci -mb 65 hg add b
66 hg ci -mb
67 echo '% adding an empty revision'
68 hg qnew -m emtpy empty
69 hg qfinish -a
70 cd ..
65 71
66 echo % echo hg to svn 72 echo % echo hg to svn
67 hg --cwd $svnpath-hg pull -q $svnpath-work 73 hg --cwd $svnpath-hg pull -q $svnpath-work
68 hg convert -s hg -d svn $svnpath-hg $svnpath-wc 74 hg convert -s hg -d svn $svnpath-hg $svnpath-wc
69 75