summaryrefslogtreecommitdiff
path: root/t/t9151-svn-mergeinfo.sh
diff options
context:
space:
mode:
authorSam Vilain <sam.vilain@catalyst.net.nz>2009-10-20 02:42:03 (GMT)
committerEric Wong <normalperson@yhbt.net>2009-10-27 06:54:24 (GMT)
commitdff589ef949e97cbec5363b105ba27f6e85594fb (patch)
tree408550b1792b33e49f76ab276a169fff6c6991ac /t/t9151-svn-mergeinfo.sh
parentce62683096d144749c77e557ecd21c91b840b0f1 (diff)
downloadgit-dff589ef949e97cbec5363b105ba27f6e85594fb.zip
git-dff589ef949e97cbec5363b105ba27f6e85594fb.tar.gz
git-dff589ef949e97cbec5363b105ba27f6e85594fb.tar.bz2
git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents
This feature is long overdue; convert SVN's merge representation to git's as revisions are imported. This works by converting the list of revisions in each line of the svn:mergeinfo into git revision ranges, and then checking the latest of each of these revision ranges for A) being new and B) now being completely merged. Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 't/t9151-svn-mergeinfo.sh')
-rw-r--r--t/t9151-svn-mergeinfo.sh21
1 files changed, 21 insertions, 0 deletions
diff --git a/t/t9151-svn-mergeinfo.sh b/t/t9151-svn-mergeinfo.sh
new file mode 100644
index 0000000..7eb36e5
--- /dev/null
+++ b/t/t9151-svn-mergeinfo.sh
@@ -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