blob: bca496c40e0a22011465083d6b36aa32e48e86b5 (
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
104
105
106
107
|
#!/bin/sh
#
# Copyright (c) 2006 Eric Wong
test_description='git svn commit-diff clobber'
. ./lib-git-svn.sh
test_expect_success 'initialize repo' '
mkdir import &&
(
cd import &&
echo initial >file &&
svn_cmd import -m "initial" . "$svnrepo"
) &&
echo initial > file &&
git update-index --add file &&
git commit -a -m "initial"
'
test_expect_success 'commit change from svn side' '
svn_cmd co "$svnrepo" t.svn &&
(
cd t.svn &&
echo second line from svn >>file &&
poke file &&
svn_cmd commit -m "second line from svn"
) &&
rm -rf t.svn
'
test_expect_success 'commit conflicting change from git' '
echo second line from git >> file &&
git commit -a -m "second line from git" &&
test_must_fail git svn commit-diff -r1 HEAD~1 HEAD "$svnrepo"
'
test_expect_success 'commit complementing change from git' '
git reset --hard HEAD~1 &&
echo second line from svn >> file &&
git commit -a -m "second line from svn" &&
echo third line from git >> file &&
git commit -a -m "third line from git" &&
git svn commit-diff -r2 HEAD~1 HEAD "$svnrepo"
'
test_expect_success 'dcommit fails to commit because of conflict' '
git svn init "$svnrepo" &&
git svn fetch &&
git reset --hard refs/remotes/git-svn &&
svn_cmd co "$svnrepo" t.svn &&
(
cd t.svn &&
echo fourth line from svn >>file &&
poke file &&
svn_cmd commit -m "fourth line from svn"
) &&
rm -rf t.svn &&
echo "fourth line from git" >> file &&
git commit -a -m "fourth line from git" &&
test_must_fail git svn dcommit
'
test_expect_success 'dcommit does the svn equivalent of an index merge' "
git reset --hard refs/remotes/git-svn &&
echo 'index merge' > file2 &&
git update-index --add file2 &&
git commit -a -m 'index merge' &&
echo 'more changes' >> file2 &&
git update-index file2 &&
git commit -a -m 'more changes' &&
git svn dcommit
"
test_expect_success 'commit another change from svn side' '
svn_cmd co "$svnrepo" t.svn &&
(
cd t.svn &&
echo third line from svn >>file &&
poke file &&
svn_cmd commit -m "third line from svn"
) &&
rm -rf t.svn
'
test_expect_success 'multiple dcommit from git svn will not clobber svn' "
git reset --hard refs/remotes/git-svn &&
echo new file >> new-file &&
git update-index --add new-file &&
git commit -a -m 'new file' &&
echo clobber > file &&
git commit -a -m 'clobber' &&
test_must_fail git svn dcommit
"
test_expect_success 'check that rebase really failed' '
git status >output &&
grep currently.rebasing output
'
test_expect_success 'resolve, continue the rebase and dcommit' "
echo clobber and I really mean it > file &&
git update-index file &&
git rebase --continue &&
git svn dcommit
"
test_done
|
