From: Jeff King <peff@peff.net>
To: Techlive Zheng <techlivezheng@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: merge recursive and code movement
Date: Mon, 16 Jul 2012 08:26:40 -0400 [thread overview]
Message-ID: <20120716122640.GC4962@sigill.intra.peff.net> (raw)
In-Reply-To: <loom.20120716T021344-246@post.gmane.org>
On Mon, Jul 16, 2012 at 12:17:26AM +0000, Techlive Zheng wrote:
> So, Is there any progress on these patches, I am currently need this
> functionality very much, will these be merged into master?
No. Turning on break detection in merge-recursive triggered bugs
elsewhere in merge-recursive. See these followup posts:
http://article.gmane.org/gmane.comp.version-control.git/175932
http://article.gmane.org/gmane.comp.version-control.git/175990
The merge-recursive code is sufficiently horrific that I have been
successfully putting off digging back into the problem for a whole
year. :)
Until those problems are resolved, the patches have too many regressions
to go into master.
-Peff
PS If you are going to reply to a year-old thread, it is probably a good
idea to give some context in your message, and to cc the involved
parties. Most of us use threaded mail readers, but not everybody keeps a
year of archives around. The original discussion and patches were here:
http://thread.gmane.org/gmane.comp.version-control.git/169944
prev parent reply other threads:[~2012-07-16 12:26 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 ` merge recursive and code movement Jay Soffian
2012-07-16 0:17 ` Techlive Zheng
2012-07-16 12:26 ` Jeff King [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=20120716122640.GC4962@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=techlivezheng@gmail.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).