summaryrefslogtreecommitdiff
path: root/t/t9161-git-svn-mergeinfo-push.sh
blob: 1eab7015c7fce6fb9a41b52dc4bb1a173455a4d6 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
#!/bin/sh
#
# Portions copyright (c) 2007, 2009 Sam Vilain
# Portions copyright (c) 2011 Bryan Jacobs
#
 
test_description='git-svn svn mergeinfo propagation'
 
. ./lib-git-svn.sh
 
test_expect_success 'load svn dump' "
	svnadmin load -q '$rawsvnrepo' \
	  < '$TEST_DIRECTORY/t9161/branches.dump' &&
	git svn init --minimize-url -R svnmerge \
	  -T trunk -b branches '$svnrepo' &&
	git svn fetch --all
	"
 
test_expect_success 'propagate merge information' '
	git config svn.pushmergeinfo yes &&
	git checkout svnb1 &&
	git merge --no-ff svnb2 &&
	git svn dcommit
	'
 
test_expect_success 'check svn:mergeinfo' '
	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
	test "$mergeinfo" = "/branches/svnb2:3,8"
	'
 
test_expect_success 'merge another branch' '
	git merge --no-ff svnb3 &&
	git svn dcommit
	'
 
test_expect_success 'check primary parent mergeinfo respected' '
	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
	test "$mergeinfo" = "/branches/svnb2:3,8
/branches/svnb3:4,9"
	'
 
test_expect_success 'merge existing merge' '
	git merge --no-ff svnb4 &&
	git svn dcommit
	'
 
test_expect_success "check both parents' mergeinfo respected" '
	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
	test "$mergeinfo" = "/branches/svnb2:3,8
/branches/svnb3:4,9
/branches/svnb4:5-6,10-12
/branches/svnb5:6,11"
	'
 
test_expect_success 'make further commits to branch' '
	git checkout svnb2 &&
	touch newb2file &&
	git add newb2file &&
	git commit -m "later b2 commit" &&
	touch newb2file-2 &&
	git add newb2file-2 &&
	git commit -m "later b2 commit 2" &&
	git svn dcommit
	'
 
test_expect_success 'second forward merge' '
	git checkout svnb1 &&
	git merge --no-ff svnb2 &&
	git svn dcommit
	'
 
test_expect_success 'check new mergeinfo added' '
	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
	test "$mergeinfo" = "/branches/svnb2:3,8,16-17
/branches/svnb3:4,9
/branches/svnb4:5-6,10-12
/branches/svnb5:6,11"
	'
 
test_expect_success 'reintegration merge' '
	git checkout svnb4 &&
	git merge --no-ff svnb1 &&
	git svn dcommit
	'
 
test_expect_success 'check reintegration mergeinfo' '
	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb4)
	test "$mergeinfo" = "/branches/svnb1:2-4,7-9,13-18
/branches/svnb2:3,8,16-17
/branches/svnb3:4,9
/branches/svnb5:6,11"
	'
 
test_expect_success 'dcommit a merge at the top of a stack' '
	git checkout svnb1 &&
	touch anotherfile &&
	git add anotherfile &&
	git commit -m "a commit" &&
	git merge svnb4 &&
	git svn dcommit
	'
 
test_done