blob: 5d91d056d2ff97bb4253671cde8ac9a207bd6bd9 (
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
|
#!/bin/sh
#
# Copyright (c) 2005 Fredrik Kuivinen
#
test_description='Test merge with directory/file conflicts'
. ./test-lib.sh
test_expect_success 'prepare repository' \
'echo "Hello" > init &&
git add init &&
git commit -m "Initial commit" &&
git branch B &&
mkdir dir &&
echo "foo" > dir/foo &&
git add dir/foo &&
git commit -m "File: dir/foo" &&
git checkout B &&
echo "file dir" > dir &&
git add dir &&
git commit -m "File: dir"'
test_expect_success 'Merge with d/f conflicts' '
test_expect_code 1 git merge "merge msg" B master
'
test_expect_success 'F/D conflict' '
git reset --hard &&
git checkout master &&
rm .git/index &&
mkdir before &&
echo FILE >before/one &&
echo FILE >after &&
git add . &&
git commit -m first &&
rm -f after &&
git mv before after &&
git commit -m move &&
git checkout -b para HEAD^ &&
echo COMPLETELY ANOTHER FILE >another &&
git add . &&
git commit -m para &&
git merge master
'
test_done
|
