| commit | c72424b1b5d511a346742dba62bec93a719ef1c8 | |
| author | Kevin Bracey <kevin@bracey.fi> | |
| Thu, 16 May 2013 15:32:28 +0000 (16 18:32 +0300) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 16 May 2013 18:51:08 +0000 (16 11:51 -0700) | ||
| tree | 57027dc51ebd9fb7450f650c74b6ee583a1c7dcb | treesnapshot (tar.gz zip) |
| parent | 83f0412f3fff3b4108e7f05c30f3e861d148f5f2 | commitdiff |
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>
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>
| t/t6019-rev-list-ancestry-path.sh | diffblobblamehistory |