t6019: test file dropped in -s ours merge
In preparation for upcoming TREESAME work, check the result for G.t, which is dropped in "-s ours" merge L. The default rev-list is empty, as expected - it follows the first parent path where it never existed. Unfortunately, --ancestry-path is also empty. Merges H J and L are all TREESAME to 1 parent, so are treated as TREESAME and not shown. This is clearly undesirable in the case of merge L, which dropped our G.t by taking the non-ancestry-path version. Document this as a known failure, and expect "H J L", the 3 merges along the path that had to chose G.t versions. Signed-off-by: Kevin Bracey <kevin@bracey.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Kevin Bracey committed
May 16, 2013 at 18:32 UTC
c72424b1b5d511a346742dba62bec93a719ef1c8
1 file changed
+19
t/t6019-rev-list-ancestry-path.sh
+19
@@ -16,6 +16,9 @@ test_description='--ancestry-path'
16
#
17
# F...I == F G H I
18
# --ancestry-path F...I == F H I
19
+#
20
+# G..M -- G.t == [nothing - was dropped in "-s ours" merge L]
21
+# --ancestry-path G..M -- G.t == H J L
22
23
. ./test-lib.sh
24
@@ -89,6 +92,22 @@ test_expect_success 'rev-list --ancestry-path F...I' '
92
test_cmp expect actual
93
'
94
95
+# G.t is dropped in an "-s ours" merge
96
+test_expect_success 'rev-list G..M -- G.t' '
97
+ >expect &&
98
+ git rev-list --format=%s G..M -- G.t |
99
+ sed -e "/^commit /d" >actual &&
100
+ test_cmp expect actual
101
+'
102
+
103
+test_expect_failure 'rev-list --ancestry-path G..M -- G.t' '
104
+ for c in H J L; do echo $c; done >expect &&
105
+ git rev-list --ancestry-path --format=%s G..M -- G.t |
106
+ sed -e "/^commit /d" |
107
+ sort >actual &&
108
+ test_cmp expect actual
109
+'
110
+
111
# b---bc
112
# / \ /
113
# a X