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

Re: What's cooking in git.git (Nov 2013, #01; Fri, 1)

From
Michael Haggerty <mhagger@alum.mit.edu>
Date
Nov 13, 2013, 16:03 UTC
Message-ID
<5283A2D3.2080309@alum.mit.edu>
In-Reply-To
<878ux7g1ml.fsf@linux-k42r.v.cablecom.net>
On 11/02/2013 12:09 AM, Thomas Rast wrote:
Show 9 quoted lines
> Junio C Hamano <gitster@pobox.com> writes:
>
>> * tr/merge-recursive-index-only (2013-10-28) 3 commits
>>   - merge-recursive: -Xindex-only to leave worktree unchanged
>>   - merge-recursive: internal flag to avoid touching the worktree
>>   - merge-recursive: remove dead conditional in update_stages()
>
> FWIW -- since you dropped the earlier note to the same effect -- I still
> consider this "hold until Michael finds a use for it".
Thomas,

Sorry, I didn't realize that you are waiting on me. I've been very busy lately and just got back from a trip to San Francisco. The chaos is scheduled to continue for at least another week.

The biggest win from being able to run test merges without touching the tree would be to move a lot of the time-consuming processing work of git-imerge into the background while the user is asked to resolve conflicts. It's kindof awkward, though, because for the user to resolve a conflict control has to be passed back to the user. So the main git-imerge process would have to spawn off a worker daemon process that would continue working in the background. But then there has to be some kind of communication between the worker thread and the user's *subsequent* call to "git imerge continue".

So the bottom line is that it is nontrivial to implement this so I will need a bit of concentrated time to dedicate to git-imerge before I will be able to give you any feedback.

Michael
-- 
Michael Haggerty
mhagger@alum.mit.edu
http://softwareswirl.blogspot.com/
Previous: Junio C HamanoNext: Ramsay Jones
Message 4 of 9 in “What's cooking in git.git (Nov 2013, #01; Fri, 1)”
  1. Junio C HamanoNov 1, 2013
  2. Thomas RastNov 1, 2013
  3. Junio C HamanoNov 4, 2013
  4. Michael HaggertyNov 13, 2013
  5. Ramsay JonesNov 1, 2013
  6. Junio C HamanoNov 4, 2013
  7. Junio C HamanoNov 11, 2013
  8. Torstein HeggeNov 3, 2013
  9. Junio C HamanoNov 4, 2013

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.