On Fri, Dec 09, 2011 at 07:48:52PM +0100, Sebastian Pipping wrote: > On 12/09/2011 05:16 PM, William Hubbs wrote: > > Yes, I saw it, but it doesn't seem to do what we want. It merges the > > branches together instead of swapping them. > > Maybe it's not what _you_ want, but it does > > - make catalyst_2 content appear on master > > - doesn't break fast forward "git pull" for anyone > > - supports branching catalyst_2 off master, too
The method you are suggesting does _NOT_ make the current content of master appear on catalyst_3, which is the other part of what releng is requesting. What I think I can do, but I'm not quite sure how to do it, is: 1) create a catalyst_3 branch at the same point in history where catalyst_2 was created. I believe I can accomplish this with git branch catalyst_3 $(git merge-base master catalyst_2) 2) put the code on master that is _NOT_ on catalyst_2 on catalyst_3. Any suggestions for how to do this? 3) put the code on catalyst_2 on master. What about this? William
pgpuLFG7WTRbg.pgp
Description: PGP signature
