Re: [PATCH] Fall back to three-way merge when applying a patch.

From: Linus Torvalds <torvalds@osdl.org>
Date: 2005-10-06 00:30:17
On Tue, 4 Oct 2005, Junio C Hamano wrote:

> What is your workflow after seeing that the 47th patch among 175
> patches fails to apply?  I understand you run git-applymbox
> without -q, so it immediately fails and exits there.

Correct. 

What I usually do is to just ignore the split patches, and go back to the 
mbox. Delete the ones that applied, and look at the one that didn't. Then 
I try to apply that one manually - sometimes I actually do a quick manual 
branch to a known version, apply and merge - and I think I might try to 
use the "base wiggle" patch for that. Although I would actually prefer to 
be able to try against a specific named release (not "all named tags" 
first).

Quite often, the reason it doesn't apply is that I already have that patch 
through a git merge (or because I applied that patch earlier through 
another person), in which case I don't even try to merge it, I just delete 
that email too, and just do "git-applymbox" again.

		Linus
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Received on Thu Oct 06 00:32:42 2005

This archive was generated by hypermail 2.1.8 : 2005-10-06 00:32:46 EST