3 # this script sets up a Subversion repository for Makefile in the
4 # first ever git merge, as if it were done with svnmerge (SVN 1.5+)
11 svnadmin create foo.svn
12 svn co file://`pwd`/foo.svn foo
17 svn add trunk branches
18 svn commit -m "Setup trunk and branches"
21 git cat-file blob 6683463e:Makefile > Makefile
24 echo "Committing ANCESTOR"
25 svn commit -m "ancestor"
27 svn cp trunk branches/left
29 echo "Committing BRANCH POINT"
30 svn commit -m "make left branch"
31 svn cp trunk branches/right
33 echo "Committing other BRANCH POINT"
34 svn commit -m "make right branch"
38 #svn commit -m "init svnmerge"
40 git cat-file blob 5873b67e:Makefile > Makefile
41 echo "Committing BRANCH UPDATE 1"
42 svn commit -m "left update 1"
46 git cat-file blob 75118b13:Makefile > Makefile
47 echo "Committing TRUNK UPDATE"
48 svn commit -m "trunk update"
51 git cat-file blob ff5ebe39:Makefile > Makefile
52 echo "Committing BRANCH UPDATE 2"
53 svn commit -m "left update 2"
55 git cat-file blob b5039db6:Makefile > Makefile
56 echo "Committing BRANCH UPDATE 3"
57 svn commit -m "left update 3"
65 svn merge ../branches/left --accept postpone
67 git cat-file blob b51ad431:Makefile > Makefile
71 svn commit -m "Merge trunk 1"
73 # create commits on both branches
76 git cat-file blob ff5ebe39:Makefile > Makefile
77 echo "Committing BRANCH UPDATE 4"
78 svn commit -m "left update 4"
81 git cat-file blob b5039db6:Makefile > Makefile
82 echo "Committing other BRANCH UPDATE 1"
83 svn commit -m "right update 1"
91 svn merge ../branches/left --accept postpone
93 git cat-file blob b51ad431:Makefile > Makefile
97 svn commit -m "Merge trunk 2"
101 svnadmin dump foo.svn > svn-mergeinfo.dump