Re: merge recursive and code movement

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