3 # this script sets up a Subversion repository for Makefile in the
4 # first ever git merge, as if it were done with svk.
9 svk depotmap foo ~
/.svk
/foo
14 svk add trunk branches
15 svk commit
-m "Setup trunk and branches"
18 git cat-file blob
6683463e
:Makefile
> Makefile
21 svk commit
-m "ancestor"
23 svk
cp trunk branches
/left
25 svk commit
-m "make left branch"
28 git cat-file blob
5873b67e
:Makefile
> Makefile
29 svk commit
-m "left update 1"
32 git cat-file blob
75118b13
:Makefile
> Makefile
33 svk commit
-m "trunk update"
36 git cat-file blob b5039db6
:Makefile
> Makefile
37 svk commit
-m "left update 2"
40 svk sm
/foo
/branches
/left
41 # in theory we could delete the "left" branch here, but it's not
42 # required so don't do it, in case people start getting ideas ;)
43 svk commit
-m "merge branch 'left' into 'trunk'"
45 git cat-file blob b51ad431
:Makefile
> Makefile
47 svk
diff Makefile
&& echo "Hey! No differences, magic"
51 svnadmin dump ~
/.svk
/foo
> svk-merge.dump