git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: merge recursive and code movement

From
Jeff King <peff@peff.net>
Date
Jul 16, 2012, 12:26 UTC
Message-ID
<20120716122640.GC4962@sigill.intra.peff.net>
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
Previous: Techlive Zheng
Message 14 of 14 in “merge recursive and code movement”
  1. Jay SoffianMar 24, 2011
  2. Jeff KingMar 25, 2011
  3. Jeff KingMar 25, 2011
  4. Jeff KingMar 25, 2011
  5. Jeff KingMar 25, 2011
  6. 1/3 t3030: fix accidental success in symlink renameJeff King, Mar 25, 2011
  7. Junio C HamanoMar 25, 2011
  8. Jeff KingMar 25, 2011
  9. Schalk, KenMar 25, 2011
  10. 2/3 merge: handle renames with replacement contentJeff King, Mar 25, 2011
  11. 3/3 merge: turn on rewrite detectionJeff King, Mar 25, 2011
  12. Jay SoffianMar 25, 2011
  13. Techlive ZhengJul 16, 2012
  14. Jeff KingJul 16, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.