Re: rebase hint unmerged file removed

From: Miklos Vajna <vmiklos@frugalware.org>
Date: Aug 25, 2009, 08:11 UTC
Message-ID: <20090825081146.GK5929@genesis.frugalware.org>
In-Reply-To: <4A939455.5030908@viscovery.net>

On Tue, Aug 25, 2009 at 09:35:49AM +0200, Johannes Sixt <j.sixt@viscovery.net> wrote:

Show 10 quoted lines

> Ok, I bisected it to 6eb1b437 (cherry-pick/revert: make direct internal
> call to merge_tree(), 2008-09-02), which is part of a series around
> merge-recursive: 1ad6d46..ed520a8
> 
> The commit message says: "One regression is that the status message is
> lost as there is no way to flush them from outside the refactored library
> code yet." But is it intentional that these messages were never recovered?
> 
> BTW, I miss the messages a lot, too, but I'm unfamiliar with the code in
> question to try to do something about it.

I do not remember too much about this. The point of the commit was to avoid fork()ing a new merge-recursive process, that's for sure. I tried to search back the archive to see what was the interdiff between my patch and Junio's fixup, but I haven't found my patch.

I think it's possible that I was not aware of this limitation at all and just Junio added it as a note to the commit message, but I'm not 100% sure.

I also think that it's possible to modify the library code to be able to flush the status message outside the library, but I can't really send a patch that implements this right now, due to lack of time.

Sorry,

Miklos