From: Christian MICHON Date: Mon, 12 Jan 2009 09:57:42 GMT Subject: Re: patches in context format ? Message-ID: <46d6db660901120157g49aa8f8eo957cf4a0f5d279f0@mail.gmail.com> In-Reply-To: <20090112095250.GB3079@coredump.intra.peff.net> On Mon, Jan 12, 2009 at 10:52 AM, Jeff King wrote: > On Mon, Jan 12, 2009 at 10:00:11AM +0100, Christian MICHON wrote: > >> The current solution I have is to use the original patch command, >> stage modifications and add new files. I do not like this solution, >> because I have to work out the commit messages out of the mbox and I >> lose reproducibility. I'm basically maintaining a subset of shell >> scripts, the original patches and an artificial way (ugly) to get >> timestamps of modifications (for the commit dates). >> >> Instead of this complicated procedure, I'd like to use "git apply" or >> "git am", provided I can get git to support "context output format" as >> input for patches ? > > Maybe this is not the nicest solution if you are going to apply a lot of > these patches, but you can pick up where git-am fails, run patch, and > ask it to resume: > > $ git am mbox-with-context-diff > Applying: a minor change > error: No changes > Patch failed at 0001. > When you have resolved this problem run "git am --resolved". > If you would prefer to skip this patch, instead run "git am --skip". > To restore the original branch and stop patching run "git am --abort". > > $ patch <.git/rebase-apply/patch ;# or whatever > $ git add -u > $ git am -r > Applying: a minor change > > -Peff > vim patches are in hundredth... so I guess this is too manual. Thanks for the suggestion! -- Christian -- http://detaolb.sourceforge.net/, a linux distribution for Qemu with Git inside !