Re: [gentoo-catalyst] rfc: merging catalyst git branches

[Sebastian Pipping]

On 12/10/2011 03:45 PM, William Hubbs wrote:
>>  - supports branching catalyst_2 off master, too

s/catalyst_2/catalyst_3/


> 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.

That's a trivial addition.  With it, the full run on my shell:

 # git branch catalyst_3 master

 # git checkout master

 # git merge $(git commit-tree catalyst_2^{tree} \
     -p catalyst_2 -p master \
     <<<"Replace content on master with content from catalyst_2")

 # git push origin master

 # git push origin catalyst_3


Results is:

 - 2.x content on branch master (and catalyest_2)

 - 3.x content on branch catalyest_3


> 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)

The branch head is moving along with each commit so it would end up at
the current master in the end, anyway.

If you like to mark the point where catalyst 3.x was started, a tag
would be the right tool, not a branch.


> 2) put the code on master that is _NOT_ on catalyst_2 on catalyst_3.
>
> Any suggestions for how to do this?

I'm not sure what you mean by that.


> 3) put the code on catalyst_2 on master.
>
> What about this?

Either git commit-tree or forced push.

Best,



Sebastian