From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, oinksocket@letterboxes.org,
Elijah Newren <newren@gmail.com>
Subject: Re: [PATCHv2 0/2] Fix resolvable rename + D/F conflict testcases
Date: Wed, 8 Sep 2010 00:41:26 -0600 [thread overview]
Message-ID: <AANLkTin0KidU3og7SVEVUAaRfMzafEvvme_vP-0V773E@mail.gmail.com> (raw)
In-Reply-To: <1283928041-9882-1-git-send-email-newren@gmail.com>
On Wed, Sep 8, 2010 at 12:40 AM, Elijah Newren <newren@gmail.com> wrote:
> This fixes an issue reported by Nick (no lastname given) on the
> mailing list, as well as a closely related issue in the handling of
> rename + directory/file conflicts, namely where a filename on one side
> of the rename is a directory name on the other side of the merge.
>
> Change since v1:
> * Split unrelated 2/3 patch out into a separate submission
...oh, and now the series is based on master instead of next. (I
would base it on maint, but since I was adding another testcase to
t3509 and t3509 does not yet exist in maint, I couldn't as easily put
it there.)
prev parent reply other threads:[~2010-09-08 6:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-08 6:40 [PATCHv2 0/2] Fix resolvable rename + D/F conflict testcases Elijah Newren
2010-09-08 6:40 ` [PATCHv2 1/2] t3509: Add rename + D/F conflict testcase that recursive strategy fails Elijah Newren
2010-09-08 6:40 ` [PATCHv2 2/2] merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir Elijah Newren
2010-09-10 0:26 ` Junio C Hamano
2010-09-08 6:41 ` Elijah Newren [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=AANLkTin0KidU3og7SVEVUAaRfMzafEvvme_vP-0V773E@mail.gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=oinksocket@letterboxes.org \
/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).