path: root/t/t9151/make-svnmerge-dump
diff options
authorSam Vilain <>2009-10-20 02:42:02 (GMT)
committerEric Wong <>2009-10-27 06:51:55 (GMT)
commitce62683096d144749c77e557ecd21c91b840b0f1 (patch)
treeb0367af91492041041cd0ed429786885e548ed05 /t/t9151/make-svnmerge-dump
parentf1264bd65451a68e87e0f99c9601cfa1b3244db6 (diff)
git-svn: add test data for SVN 1.5+ merge, with script.
Dump generated with SVN 1.5.1 (on lenny amd64). This test should hopefully cover all but a few intermediate versions of the script. Signed-off-by: Sam Vilain <> Acked-by: Eric Wong <>
Diffstat (limited to 't/t9151/make-svnmerge-dump')
1 files changed, 73 insertions, 0 deletions
diff --git a/t/t9151/make-svnmerge-dump b/t/t9151/make-svnmerge-dump
new file mode 100644
index 0000000..e35d64d
--- /dev/null
+++ b/t/t9151/make-svnmerge-dump
@@ -0,0 +1,73 @@
+# this script sets up a Subversion repository for Makefile in the
+# first ever git merge, as if it were done with svnmerge (SVN 1.5+)
+rm -rf foo.svn foo
+set -e
+mkdir foo.svn
+svnadmin create foo.svn
+svn co file://`pwd`/foo.svn foo
+cd foo
+mkdir trunk
+mkdir branches
+svn add trunk branches
+svn commit -m "Setup trunk and branches"
+cd trunk
+git cat-file blob 6683463e:Makefile > Makefile
+svn add Makefile
+echo "Committing ANCESTOR"
+svn commit -m "ancestor"
+cd ..
+svn cp trunk branches/left
+echo "Committing BRANCH POINT"
+svn commit -m "make left branch"
+cd branches/left/
+#$sm init
+#svn commit -m "init svnmerge"
+git cat-file blob 5873b67e:Makefile > Makefile
+echo "Committing BRANCH UPDATE 1"
+svn commit -m "left update 1"
+cd ../..
+cd trunk
+git cat-file blob 75118b13:Makefile > Makefile
+echo "Committing TRUNK UPDATE"
+svn commit -m "trunk update"
+cd ../branches/left
+git cat-file blob ff5ebe39:Makefile > Makefile
+echo "Committing BRANCH UPDATE 2"
+svn commit -m "left update 2"
+git cat-file blob b5039db6:Makefile > Makefile
+echo "Committing BRANCH UPDATE 3"
+svn commit -m "left update 3"
+# merge to trunk
+cd ../..
+svn update
+cd trunk
+svn merge ../branches/left --accept postpone
+git cat-file blob b51ad431:Makefile > Makefile
+svn resolved Makefile
+svn commit -m "Merge trunk"
+cd ../..
+svnadmin dump foo.svn > svn-mergeinfo.dump
+rm -rf foo foo.svn