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"
34 #svn commit -m "init svnmerge"
36 git cat-file blob
5873b67e
:Makefile
> Makefile
37 echo "Committing BRANCH UPDATE 1"
38 svn commit
-m "left update 1"
42 git cat-file blob
75118b13
:Makefile
> Makefile
43 echo "Committing TRUNK UPDATE"
44 svn commit
-m "trunk update"
47 git cat-file blob ff5ebe39
:Makefile
> Makefile
48 echo "Committing BRANCH UPDATE 2"
49 svn commit
-m "left update 2"
51 git cat-file blob b5039db6
:Makefile
> Makefile
52 echo "Committing BRANCH UPDATE 3"
53 svn commit
-m "left update 3"
61 svn merge ..
/branches
/left
--accept postpone
63 git cat-file blob b51ad431
:Makefile
> Makefile
67 svn commit
-m "Merge trunk"
71 svnadmin dump foo.svn
> svn-mergeinfo.dump