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
|
#!/bin/sh
test_description='Test that "stg float" can handle conflicts'
. ./test-lib.sh
test_expect_success 'Test setup' '
stg init &&
echo expected.txt >> .git/info/exclude &&
echo first line > foo.txt &&
git add foo.txt &&
git commit -m p0 &&
echo foo >> foo.txt &&
git add foo.txt &&
git commit -m p1 &&
echo foo2 >> foo.txt &&
git add foo.txt &&
git commit -m p2 &&
stg uncommit -n 3
'
cat > expected.txt <<EOF
first line
<<<<<<< current
=======
foo
foo2
>>>>>>> patched
EOF
test_expect_success 'Float a patch, causing a conflict with the next patch' '
conflict stg float p1 &&
test "$(echo $(stg series))" = "+ p0 > p2 - p1" &&
test "$(stg id p2)" = "$(git rev-list HEAD~0 -n 1)" &&
test "$(stg id p0)" = "$(git rev-list HEAD~1 -n 1)" &&
test "$(stg status)" = "UU foo.txt" &&
test_cmp foo.txt expected.txt
'
test_done
|
