From: Elijah Newren <newren@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: Re: [RFC PATCH 4/9] Add testcases for improved file collision conflict handling
Date: Sat, 11 Nov 2017 08:52:40 -0800 [thread overview]
Message-ID: <CABPp-BG+AzbR7K=qOGMHV=E_y7YL7son_+STAxd2-2t+qF+8XQ@mail.gmail.com> (raw)
In-Reply-To: <20171110222156.23221-5-newren@gmail.com>
On Fri, Nov 10, 2017 at 2:21 PM, Elijah Newren <newren@gmail.com> wrote:
> Adds testcases dealing with file collisions for the following types of
> conflicts:
> * add/add
> * rename/add
> * rename/rename(2to1)
<snip>
> ---
> t/t6036-recursive-corner-cases.sh | 8 +-
The changes to t6036 were supposed to have been squashed into a later
commit in this series; I apparently flubbed it and squashed it into
the wrong commit. Will fix together with whatever other feedback I
get on the series before re-posting.
> t/t6042-merge-rename-corner-cases.sh | 210 +++++++++++++++++++++++++++++++++++
> 2 files changed, 214 insertions(+), 4 deletions(-)
next prev parent reply other threads:[~2017-11-11 16:52 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-10 22:21 [RFC PATCH 0/9] Improve rename detection performance in merge recursive Elijah Newren
2017-11-10 22:21 ` [RFC PATCH 1/9] diffcore-rename: No point trying to find a match better than exact Elijah Newren
2017-11-10 22:21 ` [RFC PATCH 2/9] merge-recursive: Avoid unnecessary string list lookups Elijah Newren
2017-11-10 22:21 ` [RFC PATCH 3/9] merge-recursive: New function for better colliding conflict resolutions Elijah Newren
2017-11-11 16:49 ` Elijah Newren
2017-11-10 22:21 ` [RFC PATCH 4/9] Add testcases for improved file collision conflict handling Elijah Newren
2017-11-11 16:52 ` Elijah Newren [this message]
2017-11-10 22:21 ` [RFC PATCH 5/9] merge-recursive: Fix rename/add " Elijah Newren
2017-11-10 22:21 ` [RFC PATCH 6/9] merge-recursive: Improve handling for rename/rename(2to1) conflicts Elijah Newren
2017-11-10 22:21 ` [RFC PATCH 7/9] merge-recursive: Improve handling for add/add conflicts Elijah Newren
2017-11-10 22:21 ` [RFC PATCH 8/9] merge-recursive: Accelerate rename detection Elijah Newren
2017-11-10 22:21 ` [RFC PATCH 9/9] diffcore-rename: Filter rename_src list when possible Elijah Newren
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='CABPp-BG+AzbR7K=qOGMHV=E_y7YL7son_+STAxd2-2t+qF+8XQ@mail.gmail.com' \
--to=newren@gmail.com \
--cc=git@vger.kernel.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).