Skip to content

Commit ce62683

Browse files
Sam VilainEric Wong
Sam Vilain
authored and
Eric Wong
committed
git-svn: add test data for SVN 1.5+ merge, with script.
Dump generated with SVN 1.5.1 (on lenny amd64). This test should hopefully cover all but a few intermediate versions of the svnmerge.py script. Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> Acked-by: Eric Wong <normalperson@yhbt.net>
1 parent f1264bd commit ce62683

File tree

3 files changed

+811
-0
lines changed

3 files changed

+811
-0
lines changed

‎t/t9151/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
foo
2+
foo.svn

‎t/t9151/make-svnmerge-dump‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
#!/bin/sh
2+
#
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+)
5+
#
6+
7+
rm -rf foo.svn foo
8+
set -e
9+
10+
mkdir foo.svn
11+
svnadmin create foo.svn
12+
svn co file://`pwd`/foo.svn foo
13+
14+
cd foo
15+
mkdir trunk
16+
mkdir branches
17+
svn add trunk branches
18+
svn commit -m "Setup trunk and branches"
19+
cd trunk
20+
21+
git cat-file blob 6683463e:Makefile > Makefile
22+
svn add Makefile
23+
24+
echo "Committing ANCESTOR"
25+
svn commit -m "ancestor"
26+
cd ..
27+
svn cp trunk branches/left
28+
29+
echo "Committing BRANCH POINT"
30+
svn commit -m "make left branch"
31+
cd branches/left/
32+
33+
#$sm init
34+
#svn commit -m "init svnmerge"
35+
36+
git cat-file blob 5873b67e:Makefile > Makefile
37+
echo "Committing BRANCH UPDATE 1"
38+
svn commit -m "left update 1"
39+
cd ../..
40+
41+
cd trunk
42+
git cat-file blob 75118b13:Makefile > Makefile
43+
echo "Committing TRUNK UPDATE"
44+
svn commit -m "trunk update"
45+
46+
cd ../branches/left
47+
git cat-file blob ff5ebe39:Makefile > Makefile
48+
echo "Committing BRANCH UPDATE 2"
49+
svn commit -m "left update 2"
50+
51+
git cat-file blob b5039db6:Makefile > Makefile
52+
echo "Committing BRANCH UPDATE 3"
53+
svn commit -m "left update 3"
54+
55+
# merge to trunk
56+
57+
cd ../..
58+
svn update
59+
cd trunk
60+
61+
svn merge ../branches/left --accept postpone
62+
63+
git cat-file blob b51ad431:Makefile > Makefile
64+
65+
svn resolved Makefile
66+
67+
svn commit -m "Merge trunk"
68+
69+
cd ../..
70+
71+
svnadmin dump foo.svn > svn-mergeinfo.dump
72+
73+
rm -rf foo foo.svn

0 commit comments

Comments
 (0)