From: Jay Soffian <jaysoffian@gmail.com>
To: Jeff King <peff@peff.net>
Cc: git <git@vger.kernel.org>
Subject: Re: merge recursive and code movement
Date: Fri, 25 Mar 2011 13:32:22 -0400 [thread overview]
Message-ID: <AANLkTimWm6eim2u-SDrot_VtMuUf=wvf_P5DuYpuV-m5@mail.gmail.com> (raw)
In-Reply-To: <20110325160013.GA25851@sigill.intra.peff.net>
On Fri, Mar 25, 2011 at 12:00 PM, Jeff King <peff@peff.net> wrote:
>
> OK, I figured it out. I was thrown off by test failures in t3030, but I
> think that test is actually wrong; it documents what happens, but not
> really what we _want_ to have happen.
>
> So this is the patch series I ended up with:
>
> [1/3]: t3030: fix accidental success in symlink rename
> [2/3]: merge: handle renames with replacement content
> [3/3]: merge: turn on rewrite detection
I read through all three of these and, from my superficial
understanding of the merge code, they look correct.
I'll test these out on some actual merges as soon as I can. (Probably
next week.)
Thank you for this series.
next prev parent reply other threads:[~2011-03-25 17:32 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-24 21:18 merge recursive and code movement Jay Soffian
2011-03-25 9:37 ` Jeff King
2011-03-25 10:12 ` Jeff King
2011-03-25 11:12 ` Jeff King
2011-03-25 16:00 ` Jeff King
2011-03-25 16:03 ` [PATCH 1/3] t3030: fix accidental success in symlink rename Jeff King
2011-03-25 17:42 ` Junio C Hamano
2011-03-25 17:51 ` Jeff King
2011-03-25 18:25 ` Schalk, Ken
2011-03-25 16:06 ` [PATCH 2/3] merge: handle renames with replacement content Jeff King
2011-03-25 16:08 ` [PATCH 3/3] merge: turn on rewrite detection Jeff King
2011-03-25 17:32 ` Jay Soffian [this message]
2012-07-16 0:17 ` merge recursive and code movement Techlive Zheng
2012-07-16 12:26 ` Jeff King
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='AANLkTimWm6eim2u-SDrot_VtMuUf=wvf_P5DuYpuV-m5@mail.gmail.com' \
--to=jaysoffian@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).