1 |
On Fri, Dec 09, 2011 at 07:48:52PM +0100, Sebastian Pipping wrote: |
2 |
> On 12/09/2011 05:16 PM, William Hubbs wrote: |
3 |
> > Yes, I saw it, but it doesn't seem to do what we want. It merges the |
4 |
> > branches together instead of swapping them. |
5 |
> |
6 |
> Maybe it's not what _you_ want, but it does |
7 |
> |
8 |
> - make catalyst_2 content appear on master |
9 |
> |
10 |
> - doesn't break fast forward "git pull" for anyone |
11 |
> |
12 |
> - supports branching catalyst_2 off master, too |
13 |
|
14 |
The method you are suggesting does _NOT_ make the current content of |
15 |
master appear on catalyst_3, which is the other part of what releng is |
16 |
requesting. |
17 |
|
18 |
What I think I can do, but I'm not quite sure how to do it, is: |
19 |
|
20 |
1) create a catalyst_3 branch at the same point in history where |
21 |
catalyst_2 was created. I believe I can accomplish this with |
22 |
|
23 |
git branch catalyst_3 $(git merge-base master catalyst_2) |
24 |
|
25 |
2) put the code on master that is _NOT_ on catalyst_2 on catalyst_3. |
26 |
|
27 |
Any suggestions for how to do this? |
28 |
|
29 |
3) put the code on catalyst_2 on master. |
30 |
|
31 |
What about this? |
32 |
|
33 |
William |