On Monday 30 March 2009 14:19:11 Andreas Ericsson wrote: > Brian Foster wrote: > >[ ... ] > > (1) Create a patch which is all (local) changes > > (née diffs) from linux-mips.21 to our.21; > > This is wrong. Create several git-patches, each containing > the equivalence of one commit (complete with diff, author > info and commit message). Yes, I was being sloppy there. Internally, we use both `git format-patch' and `git am', but have a bad(?) habit of referring to a patch series as “a patch”. Apologies for the confusion. Sorry! > > (2) Checkout linux-mips.26.8 (e.g.); > > (3) Apply the patch created in (1), above; > > Except it'll be "apply the patches, re-creating history > as if it had been done with a different base from the > start". Yes. > > (4) Tag the result `like-this'; > > (5) Checkout our.21; and > > (6) Merge with `like-this'. > > Merge is not necessary. <Shrugs/> I'll going to try in both ways (with and without merging) to better understand just what the results are like. > > I admit that now that I write the steps out, it seems > > to make sense ....? Am I understanding correctly? > > Almost. "git help format-patch" and "git help am" will get > you the rest of the way, I think. ;-) Well, I did say “RTF<a named>M” is useful....! Many thanks for your patient and very helpful replies. cheers! -blf- -- “How many surrealists does it take to | Brian Foster change a lightbulb? Three. One calms | somewhere in south of France the warthog, and two fill the bathtub | Stop E$$o (ExxonMobil)! with brightly-coloured machine tools.” | http://www.stopesso.com -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
