{"thread":{"id":"14790","subject":"Is there any hope (format-patch)??","startedAt":"2008-08-01T12:05:10Z","lastAt":"2008-08-01T17:35:52Z","messageCount":2,"participants":["Matti Kaasinen","Daniel Barkalow"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"85894","messageId":"4892FBF6.8060505@sitecno.fi","threadId":"14790","inReplyTo":null,"subject":"Is there any hope (format-patch)??","fromName":"Matti Kaasinen","fromEmail":"matti.kaasinen@sitecno.fi","sentAt":"2008-08-01T12:05:10Z","receivedAt":"2008-08-01T12:05:10Z","isPatch":false,"sender":{"key":"matti.kaasinen@sitecno.fi","avatar":null},"body":"Hi!\n\nIs there any hope with following procedure:\nI took reporitory from linux git:\n# git clone \ngit://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git\n\nFor getting patches to make recent version from v2.6.26-rc3 I executed:\n# git format-patch -o patchdir v2.6.26-rc3..origin\n\nThis produced 9486 patches, two of which were empty. They both appeared \nto have two references in git.kernel.org archive so that newer ones were \nempy.\n\nThen I checked out v2.6.26-rc3 to a new branch and patched it with \nat91patch/maxim.org.za that was produced against v2.6.26-rc3. That \nworked out without complaints.\n\nThen I ran:\n\n#git quiltimport --patches patchdir\n\nI suppose, it was the fourth patch of 9486 that failed. Fail did not \ncome from any of those parts patched with at91 patch. Is this anything \nthat should work? at91 patch fails if I try it right-away over the HEAD \nbranch.\n\ncheers,\nMatti Kaasinen\n"},{"id":"85908","messageId":"alpine.LNX.1.00.0808011323110.19665@iabervon.org","threadId":"14790","inReplyTo":"4892FBF6.8060505@sitecno.fi","subject":"Re: Is there any hope (format-patch)??","fromName":"Daniel Barkalow","fromEmail":"barkalow@iabervon.org","sentAt":"2008-08-01T17:35:52Z","receivedAt":"2008-08-01T17:35:52Z","isPatch":false,"sender":{"key":"barkalow@iabervon.org","avatar":"https://avatars.githubusercontent.com/u/55364219?v=4"},"body":"On Fri, 1 Aug 2008, Matti Kaasinen wrote:\n\n> Hi!\n> \n> Is there any hope with following procedure:\n> I took reporitory from linux git:\n> # git clone\n> git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git\n> \n> For getting patches to make recent version from v2.6.26-rc3 I executed:\n> # git format-patch -o patchdir v2.6.26-rc3..origin\n\nformat-patch isn't going to work too well with non-linear history. When \ntwo people make nearby or overlapping changes which get merged later, and \nthis gets turned into a linear sequence of changes, there's no \npossible patch that will accurately reflect the change which got ordered \nsecond.\n\n> Then I checked out v2.6.26-rc3 to a new branch and patched it with\n> at91patch/maxim.org.za that was produced against v2.6.26-rc3. That worked out\n> without complaints.\n\nIt sounds like you really just want to do \"merge origin\" now, and skip the \nwhole patch series thing.\n\nYou'll probably get some conflicts (or applying the patch directly to \norigin would have worked), but they should be relatively easy to resolve.\n\n\t-Daniel\n*This .sig left intentionally blank*\n"}]}