Re: git-svnimport failed and now git-repack hates me

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jan 6, 2007, 00:06 UTC
Message-ID: <Pine.LNX.4.63.0701060103190.22628@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <7virflca43.fsf@assigned-by-dhcp.cox.net>

Hi,

On Fri, 5 Jan 2007, Junio C Hamano wrote:

Show 12 quoted lines

> Linus Torvalds <torvalds@osdl.org> writes:
> 
> >> Ah, there are those annoying "using this as the merge base whose
> >> commit log is..." business.  I wonder if anybody is actually
> >> reading them (I once considered squelching that output).
> >
> > "output_commit_title()" used it. Not just for the merge base, but for the 
> > regular "merging X and Y" messages, I think.
> 
> Yes, what I really was wondering were (1) if the messages are
> useful, and (2) if so should that belong to git-merge not
> git-merge-recursive.

Since recursive merge performs possibly more than one merge, it belongs into merge-recursive.c, _if_ we want that message.

I found it helpful for "debugging" failed _recursive_ merges. I.e. I knew which of the recursive merges introduced the many, many conflicts. But I cannot remember off-hand if that was a test merge, and if it was before, or after, I sorted the merge bases by date.

Since the conflict markers now say which commit the conflicts came from, I am okay with removing the message, though.

Ciao, Dscho