summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorLibravatar Kevin Bracey <kevin@bracey.fi>2013-05-16 18:32:28 +0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-05-16 11:51:08 -0700
commitc72424b1b5d511a346742dba62bec93a719ef1c8 (patch)
tree57027dc51ebd9fb7450f650c74b6ee583a1c7dcb /xdiff
parentdecorate.c: compact table when growing (diff)
downloadtgif-c72424b1b5d511a346742dba62bec93a719ef1c8.tar.xz
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>
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions