Code

git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents
[git.git] / t / t9151-svn-mergeinfo.sh
diff --git a/t/t9151-svn-mergeinfo.sh b/t/t9151-svn-mergeinfo.sh
new file mode 100644 (file)
index 0000000..7eb36e5
--- /dev/null
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# Copyright (c) 2007, 2009 Sam Vilain
+#
+
+test_description='git-svn svn mergeinfo properties'
+
+. ./lib-git-svn.sh
+
+test_expect_success 'load svn dump' "
+       svnadmin load -q '$rawsvnrepo' < '../t9151/svn-mergeinfo.dump' &&
+       git svn init --minimize-url -R svnmerge \
+         -T trunk -b branches '$svnrepo' &&
+       git svn fetch --all
+       "
+
+test_expect_success 'svn merges were represented coming in' "
+       [ `git cat-file commit HEAD | grep parent | wc -l` -eq 2 ]
+       "
+
+test_done