[Nut-upsdev] keeping branches in sync (was Re: [nut-commits] svn commit r1631 - branches/Experimental)

[Charles Lepple]

On Thu, Dec 18, 2008 at 4:57 PM, Arjen de Korte <nut+devel at de-korte.org> wrote:
> Citeren Charles Lepple <clepple at gmail.com>:
>
>> Also (and this is mostly for Arjen), should we build
>> branches/Experimental in Buildbot? Would it make sense to have two
>> boxes per platform - one for the trunk, and one for experimental?
>
> I would prefer not to.
>
> Now that trunk is being used to extract the next 'stable' release, I felt
> the need to have an 'incubator' where drivers that are being
> developed/tested can live until the are mature enough to be merged into the
> trunk. I even thought of naming this 'adkorte-guest' so that it is clear
> that it is 'my' area.

Not a problem.

At some point after 2.4.0 is released, we may still want to split
things off so that we don't make large changes in the 2.4.x series of
releases, but it sounds like that was not your intention with
branches/Experimental.

> Whether or not this is kept in sync with the trunk, I don't really have a
> preference. In some cases this might be useful, on the other hand I don't
> think I would sync it very often. Merging stuff back into the trunk is not
> that hard if it is only a single driver.

Works for me.

-- 
- Charles Lepple