core.hidedotfiles: hide '.git' dir by default
[git/dscho.git] / t / t9150 / make-svk-dump
blob2242f14ebec634eb68abe701b26129b0d5b7789a
1 #!/bin/sh
3 # this script sets up a Subversion repository for Makefile in the
4 # first ever git merge, as if it were done with svk.
7 set -e
9 svk depotmap foo ~/.svk/foo
10 svk co /foo/ foo
11 cd foo
12 mkdir trunk
13 mkdir branches
14 svk add trunk branches
15 svk commit -m "Setup trunk and branches"
16 cd trunk
18 git cat-file blob 6683463e:Makefile > Makefile
19 svk add Makefile
21 svk commit -m "ancestor"
22 cd ..
23 svk cp trunk branches/left
25 svk commit -m "make left branch"
26 cd branches/left/
28 git cat-file blob 5873b67e:Makefile > Makefile
29 svk commit -m "left update 1"
31 cd ../../trunk
32 git cat-file blob 75118b13:Makefile > Makefile
33 svk commit -m "trunk update"
35 cd ../branches/left
36 git cat-file blob b5039db6:Makefile > Makefile
37 svk commit -m "left update 2"
39 cd ../../trunk
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"
49 cd ../..
51 svnadmin dump ~/.svk/foo > svk-merge.dump
53 svk co -d foo
54 rm -rf foo
55 svk depotmap -d /foo/
56 rm -rf ~/.svk/foo