Gentoo Logo
Gentoo Spaceship




Note: Due to technical difficulties, the Archives are currently not up to date. GMANE provides an alternative service for most mailing lists.
c.f. bug 424647
List Archive: gentoo-catalyst
Navigation:
Lists: gentoo-catalyst: < Prev By Thread Next > < Prev By Date Next >
Headers:
To: gentoo-catalyst@g.o
From: Sebastian Pipping <sping@g.o>
Subject: Re: rfc: merging catalyst git branches
Date: Mon, 02 Jul 2012 16:55:23 +0200
On 06/25/2012 06:04 AM, Matt Turner wrote:
> On Sun, Jun 24, 2012 at 7:33 PM, Sebastian Pipping <sping@g.o> wrote:
>> On 12/10/2011 11:15 PM, Sebastian Pipping wrote:
>>> [T]he 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 catalyst_2)
>>>
>>>  - 3.x content on branch catalyst_3
>>
>> This procedure above is still left to do.  Any objections?
>> With no objections, I will go forward on next monday (2012-07-02).
> 
> If you're confident it'll work -- please proceed. No use in waiting.

Done.

Best,



Sebastian


References:
catalyst + uml
-- Victor Condino
Re: catalyst + uml
-- Chris Gianelloni
Re: catalyst + uml
-- Eric Edgar
Navigation:
Lists: gentoo-catalyst: < Prev By Thread Next > < Prev By Date Next >
Previous by thread:
Re: catalyst + uml
Next by thread:
Cannot get catalyst to work
Previous by date:
Re: catalyst + uml
Next by date:
Cannot get catalyst to work


Updated Jul 02, 2012

Summary: Archive of the gentoo-catalyst mailing list.

Donate to support our development efforts.

Copyright 2001-2013 Gentoo Foundation, Inc. Questions, Comments? Contact us.