From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 Jul 2011 23:38:12 GMT
Subject: Re: [PATCH 08/48] t6036: Add differently resolved modify/delete conflict in criss-cross test
Message-ID: <7vhb6jdusb.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1307518278-23814-9-git-send-email-newren@gmail.com>

Elijah Newren <newren@gmail.com> writes:

> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
>  t/t6036-recursive-corner-cases.sh |   83 +++++++++++++++++++++++++++++++++++++
>  1 files changed, 83 insertions(+), 0 deletions(-)
>
> diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh
> index 319b6fa..52d2ecf 100755
> --- a/t/t6036-recursive-corner-cases.sh
> +++ b/t/t6036-recursive-corner-cases.sh
> @@ -231,4 +231,87 @@ test_expect_success 'git detects differently handled merges conflict' '
>  	test $(git rev-parse :1:new_a) = $(git hash-object merged)
>  '
>  
> +#
> +# criss-cross + modify/delete:
> +#
> +#      B   D
> +#      o---o
> +#     / \ / \
> +#  A o   X   ? F
> +#     \ / \ /
> +#      o---o
> +#      C   E
> +#
> +#   Commit A: file with contents 'A\n'
> +#   Commit B: file with contents 'B\n'
> +#   Commit C: file not present
> +#   Commit D: file with contents 'B\n'
> +#   Commit E: file not present
> +#
> +# Now, when we merge commits D & E, does git detect the conflict?

Starting from A, upper branch wants to have B instead of A while the lower
branch wants the path gone, so it should result in a modify/delete conflict.

  s/# Now,.*$/Merging commits D & E should result in modify/delete conflict./