On Monday 30 March 2009 14:19:08 Johannes Sixt wrote: > Brian Foster schrieb: >[ ... ] > > Thanks for the suggestion. I'll have to experiment, > > but off-the-top-of-my-head, I think I do want a merge, > > so that it's easier to track the history of individual > > local changes. Having said that, I'm not entirely sure > > I follow your suggestions. What I think you mean is: > > > > (1) Create a patch which is all (local) changes > > (née diffs) from linux-mips.21 to our.21; > > (2) Checkout linux-mips.26.8 (e.g.); > > (3) Apply the patch created in (1), above; > > format-patch creates a patch series. You apply the whole series, > e.g. with 'git am'. But for this workflow you could also just create > a single patch and apply it to linux-mips.26.8, just as you wrote. Point taken. I was being a bit sloppy there; I well know `git format-patch' (which we use in our internal workflow) generates a patch series, and that `git am' applies them. Apologies for the confusion. Sorry! > The important point is that you forge this tree into the shape that > you finally want to have in the merge (that you will make later). > At this point you only have to deal with conflicts and regressions > that arise from your own changes, which makes your life much easier > than if you also had to deal with conflicts that are outside your > own changes. Gottcha. Thanks for clarifying. > > (4) Tag the result `like-this'; > > (5) Checkout our.21; and > > (6) Merge with `like-this'. > > No, you merge with linux-mips.26.8. This will again give you a lot > of conflicts. But you do > > (7) git checkout like-this -- . > > that is, you overwrite the merge result (that has conflicts) with > your known-good tree called "like-this". This resolves all conflicts > in the way that you wanted them. Ah! Neat. I think I get it (er, git it?) now .... 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
