From: Johannes Sixt <j.sixt@viscovery.net>
To: Sjors Gielen <dazjorz@dazjorz.com>
Cc: git@vger.kernel.org, Diederik van der Boor <vdboor@codindomain.com>
Subject: Re: [PATCH] merge-recursive: demonstrate an incorrect conflict with submodule
Date: Tue, 08 Jun 2010 13:58:29 +0200 [thread overview]
Message-ID: <4C0E3065.5070401@viscovery.net> (raw)
In-Reply-To: <4C0E2AB4.2010008@viscovery.net>
Am 6/8/2010 13:34, schrieb Johannes Sixt:
> +test_expect_failure 'merge-recursive simple w/submodule result' '
> +
> + git ls-files -s >actual &&
> + (
> + echo "100644 $o5 0 a"
> + echo "100644 $o0 0 c"
> + echo "100644 $c1 0 d"
Make this line
echo "160000 $c1 0 d"
Sorry!
> + ) >expected &&
> + test_cmp expected actual
-- Hannes
prev parent reply other threads:[~2010-06-08 11:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-07 22:46 Merging a commit from a distant branch, cherry-pick seems to fail Sjors Gielen
2010-06-08 5:57 ` Johannes Sixt
2010-06-08 11:34 ` [PATCH] merge-recursive: demonstrate an incorrect conflict with submodule Johannes Sixt
2010-06-08 11:58 ` Johannes Sixt [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C0E3065.5070401@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=dazjorz@dazjorz.com \
--cc=git@vger.kernel.org \
--cc=vdboor@codindomain.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).