[Vm-dev] VMMaker branching

Bert Freudenberg bert at freudenbergs.de
Sun Mar 20 11:37:54 UTC 2011


On 19.03.2011, at 19:48, Igor Stasenko wrote:

> 
> On 19 March 2011 19:44, Matthew Fulmer <tapplek at gmail.com> wrote:
>> 
>> On Sat, Mar 19, 2011 at 01:36:04PM -0400, David T. Lewis wrote:
>>> I have stayed away from committing anything directly to the oscog
>>> branch out of concern that it may lead to confusion between the
>>> two branches if my 'dtl' initials start showing up there. I do
>>> have some changes that can be applied to oscog (mostly to get
>>> rid of cosmetic differences between the two branches that clutter
>>> up the Montecello browser). I've sent a few of these to Eliot but
>>> I don't know if that is the preferred approach going forward.
>>> Advice welcome, as I do want to put some more effort into reconciling
>>> the code bases pretty soon.
>> 
>> MC supports branching, but lacks a built in way to mark the
>> branches as seperate. We have 3 branches of Cobalt currently,
>> and we keep them seperate by keeping them in seperate
>> repositories.
>> 
> 
> Well, i am actually used different naming for oscog branch
> (VMMaker-<name>-oscog).
> And MC lists it as a separate package.

Because the MC UI treats everything up to the last hyphen as package name (it does not look inside for the actual package name). If you named it e.g. VMMaker-<name>_oscog then it would be listed as the same package.

- Bert -




More information about the Vm-dev mailing list