git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
c945c375836849fd30bd0f6163a163d0d1627e4a blob 2700 bytes (raw)

 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
 
#!/bin/sh
#
# Copyright (c) 2007 Eric Wong
# Based on a script by Joakim Tjernlund <joakim.tjernlund@transmode.se>

test_description='git svn dcommit handles merges'

. ./lib-git-svn.sh

big_text_block () {
cat << EOF
#
# (C) Copyright 2000 - 2005
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
#
# See file CREDITS for list of people who contributed to this
# project.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation; either version 2 of
# the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
EOF
}

test_expect_success 'setup svn repository' '
	svn_cmd co "$svnrepo" mysvnwork &&
	mkdir -p mysvnwork/trunk &&
	(
		cd mysvnwork &&
		big_text_block >>trunk/README &&
		svn_cmd add trunk &&
		svn_cmd ci -m "first commit" trunk
	)
	'

test_expect_success 'setup git mirror and merge' '
	git svn init "$svnrepo" -t tags -T trunk -b branches &&
	git svn fetch &&
	git checkout -b svn remotes/origin/trunk &&
	git checkout -b merge &&
	echo new file > new_file &&
	git add new_file &&
	git commit -a -m "New file" &&
	echo hello >> README &&
	git commit -a -m "hello" &&
	echo add some stuff >> new_file &&
	git commit -a -m "add some stuff" &&
	git checkout svn &&
	mv -f README tmp &&
	echo friend > README &&
	cat tmp >> README &&
	git commit -a -m "friend" &&
	git merge merge
	'

test_debug 'gitk --all & sleep 1'

test_expect_success 'verify pre-merge ancestry' "
	test x\$(git rev-parse --verify refs/heads/svn^2) = \
	     x\$(git rev-parse --verify refs/heads/merge) &&
	git cat-file commit refs/heads/svn^ >actual && grep '^friend$' actual
	"

test_expect_success 'git svn dcommit merges' "
	git svn dcommit
	"

test_debug 'gitk --all & sleep 1'

test_expect_success 'verify post-merge ancestry' "
	test x\$(git rev-parse --verify refs/heads/svn) = \
	     x\$(git rev-parse --verify refs/remotes/origin/trunk) &&
	test x\$(git rev-parse --verify refs/heads/svn^2) = \
	     x\$(git rev-parse --verify refs/heads/merge) &&
	git cat-file commit refs/heads/svn^ >actual && grep '^friend$' actual
	"

test_expect_success 'verify merge commit message' "
	git rev-list --pretty=raw -1 refs/heads/svn >actual &&
	  grep \"    Merge branch 'merge' into svn\" actual
	"

test_done
debug log:

solving c945c3758 ...
found c945c3758 in https://public-inbox.org/git/20180313201945.8409-1-predatoramigo@gmail.com/
found 50bca62de in git.git.git
preparing index
index prepared:
100755 50bca62def6b0632cd89d1c0cfb2d98b76e6aa1d	t/t9114-git-svn-dcommit-merge.sh

applying [1/1] https://public-inbox.org/git/20180313201945.8409-1-predatoramigo@gmail.com/
diff --git a/t/t9114-git-svn-dcommit-merge.sh b/t/t9114-git-svn-dcommit-merge.sh
index 50bca62de..c945c3758 100755

Checking patch t/t9114-git-svn-dcommit-merge.sh...
Applied patch t/t9114-git-svn-dcommit-merge.sh cleanly.

index at:
100755 c945c375836849fd30bd0f6163a163d0d1627e4a	t/t9114-git-svn-dcommit-merge.sh

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).