From: Daniel Barkalow Date: Wed, 13 Aug 2008 17:54:16 GMT Subject: Re: [PATCH (1b)] merge-recursive.c: Add more generic merge_recursive_generic() Message-ID: In-Reply-To: <20080813172938.GC12871@leksak.fem-net> On Wed, 13 Aug 2008, Stephan Beyer wrote: > Hi, > > Daniel Barkalow wrote: > > You might look at builtin-checkout and see if merge_working_tree() could > > be made cleaner with this API, or if some other API could accomodate both > > cases more nicely. > > Puhh, I've not dug into merging stuff that deep, but for me it does not > look that this can be done in a useful way, i.e. merge_working_tree() > does not do a recursive merge. Ah, true. It's actually doing a single merge in the way that merge_recursive would do a single merge. I think it ought to be doing a recursive merge, but that's probably a change for later, anyway. (This is for -m, which essentially picks the uncommited changes versus the old branch, applied to the new branch uncommitted) -Daniel *This .sig left intentionally blank*