blob: d6245cee081059d98e72758a3ff7bb42730a7662 (
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
|
#!/bin/sh
#
# Copyright (c) 2012 Peter Baumann
#
test_description='git svn reset clears memoized caches'
. ./lib-git-svn.sh
svn_ver="$(svn --version --quiet)"
case $svn_ver in
0.* | 1.[0-4].*)
skip_all="skipping git-svn test - SVN too old ($svn_ver)"
test_done
;;
esac
# ... a - b - m <- trunk
# \ /
# ... c <- branch1
#
# SVN Commits not interesting for this test are abbreviated with "..."
#
test_expect_success 'initialize source svn repo' '
svn_cmd mkdir -m "create trunk" "$svnrepo"/trunk &&
svn_cmd mkdir -m "create branches" "$svnrepo/branches" &&
svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
(
cd "$SVN_TREE" &&
touch foo &&
svn_cmd add foo &&
svn_cmd commit -m "a" &&
svn_cmd cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 &&
svn_cmd switch "$svnrepo"/branches/branch1 &&
touch bar &&
svn_cmd add bar &&
svn_cmd commit -m b &&
svn_cmd switch "$svnrepo"/trunk &&
touch baz &&
svn_cmd add baz &&
svn_cmd commit -m c &&
svn_cmd up &&
svn_cmd merge "$svnrepo"/branches/branch1 &&
svn_cmd commit -m "m"
) &&
rm -rf "$SVN_TREE"
'
test_expect_success 'fetch to merge-base (a)' '
git svn init -s "$svnrepo" &&
git svn fetch --revision BASE:3
'
# git svn rebase looses the merge commit
#
# ... a - b - m <- trunk
# \
# ... c
#
test_expect_success 'rebase looses SVN merge (m)' '
git svn rebase &&
git svn fetch &&
test 1 = $(git cat-file -p master|grep parent|wc -l)
'
# git svn fetch creates correct history with merge commit
#
# ... a - b - m <- trunk
# \ /
# ... c <- branch1
#
test_expect_success 'reset and fetch gets the SVN merge (m) correctly' '
git svn reset -r 3 &&
git reset --hard origin/trunk &&
git svn fetch &&
test 2 = $(git cat-file -p origin/trunk|grep parent|wc -l)
'
test_done
|
