Re: [eGroupWare-core] How should we handle this(SVN feature commits / eGW 1.4)?

[Ralf B. <Ral...@ou...>]

Hi Oscar,

you message was hold back, because you used a different email address.

Oscar Manuel Gómez Senovilla schrieb:
> Ralf Becker escribió:
>> Hi all,
> 
>> I still think we should remove the 1.4 branch completely. Of cause with
>> a feature freeze in trunk. The existence of a release branch usually
>> encourager more the start of new developments then the fixing of the
>> existing bugs. Almost all other projects create release branches after
>> the first or second RC and not earlier. Anyway we never had a release
>> branch, without already changing the version-numbers.
> 
>> The point with the branch is not that important to me, I only think it
>> would speed up the release ...
> 
> 
> What's the current status for the commits? I was told to commit only to
> 1.4, and those fixes would be ported to trunk, but I've seen a lot of
> commits in trunk after Ralf came back, so I thought that directive got
> null since then. I have pending a small fix for language (besides the
> usual translations) and some work in site manager and RSS (where I got
> stuck until the recent fix for sessions). What should I do with these?

I personally prefer commiting everything to trunk and then merging the
appropriate stuff to the release branch.
If there are no inappropriate commit, we can also just recreate the
branch for the next beta or rc from trunk.

Just my 2 cents ...

Ralf
-- 
Ralf Becker
eGroupWare Training & Support ==> http://www.egroupware-support.de
Outdoor Unlimited Training GmbH [www.outdoor-training.de]
Handelsregister HRB Kaiserslautern 3587
Geschäftsführer Birgit und Ralf Becker
Leibnizstr. 17, 67663 Kaiserslautern, Germany
Telefon +49 (0)631 31657-0