{"thread":{"id":"14808","subject":"Re: Is there any hope (format-patch)??","startedAt":"2008-08-02T11:04:17Z","lastAt":"2008-08-02T11:04:17Z","messageCount":1,"participants":["Matti Kaasinen"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"85973","messageId":"48943F31.8080707@kolumbus.fi","threadId":"14808","inReplyTo":null,"subject":"Re: Is there any hope (format-patch)??","fromName":"Matti Kaasinen","fromEmail":"matti.kaasinen@kolumbus.fi","sentAt":"2008-08-02T11:04:17Z","receivedAt":"2008-08-02T11:04:17Z","isPatch":false,"sender":{"key":"matti.kaasinen@kolumbus.fi","avatar":null},"body":"Thanks Daniel,\nsome comments\n> ------------------------------------------------------------------------\n> 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>\n> format-patch isn't going to work too well with non-linear history. When \n> two people make nearby or overlapping changes which get merged later, and \n> this gets turned into a linear sequence of changes, there's no \n> possible patch that will accurately reflect the change which got ordered \n> second.\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>\n> It sounds like you really just want to do \"merge origin\" now, and skip the \n> whole patch series thing.\n>   \nOk, I'll try how it works, when I get back to my desk. Well, I'm running \nout of time and possibly I need to stay in the current version.\n> You'll probably get some conflicts (or applying the patch directly to \n> origin would have worked),\nThere came quite a lot of complaints from patching directly the origin. \nStrange that some were complaints of trying to re-create files. So, I \njust wonder if that patching really is needed. I suppose I should try to \nask that from maxim.org.za\n>  but they should be relatively easy to resolve.\n>   \nWell, hope so - direct patching to origin gave quite lot of complaints.\n-Matti\n"}]}