Re: Is there any hope (format-patch)??

From: Daniel Barkalow <barkalow@iabervon.org>
Date: Aug 1, 2008, 17:35 UTC
Message-ID: <alpine.LNX.1.00.0808011323110.19665@iabervon.org>
In-Reply-To: <4892FBF6.8060505@sitecno.fi>

On Fri, 1 Aug 2008, Matti Kaasinen wrote:

Show 9 quoted lines

> Hi!
> 
> Is there any hope with following procedure:
> I took reporitory from linux git:
> # git clone
> git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
> 
> For getting patches to make recent version from v2.6.26-rc3 I executed:
> # git format-patch -o patchdir v2.6.26-rc3..origin

format-patch isn't going to work too well with non-linear history. When two people make nearby or overlapping changes which get merged later, and this gets turned into a linear sequence of changes, there's no possible patch that will accurately reflect the change which got ordered second.

> Then I checked out v2.6.26-rc3 to a new branch and patched it with
> at91patch/maxim.org.za that was produced against v2.6.26-rc3. That worked out
> without complaints.

It sounds like you really just want to do "merge origin" now, and skip the whole patch series thing.

You'll probably get some conflicts (or applying the patch directly to origin would have worked), but they should be relatively easy to resolve.

	-Daniel
*This .sig left intentionally blank*