[prev in list] [next in list] [prev in thread] [next in thread] 

List:       koffice-devel
Subject:    Re: feature branch during freeze
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2010-09-08 17:12:14
Message-ID: 201009081912.14843.boud () valdyas ! org
[Download RAW message or body]

On Wednesday 08 September 2010, C. Boemann wrote:
> On Wednesday 08 September 2010 15:26:52 Boudewijn Rempt wrote:
> > I have just created koffice-essen for feature development during the
> > freeze. To re-iterate the rules:
> > 
> > * bug fixes go into trunk
> > * feature development can go in the branch.
> > * for the branch, reviewboard is not necessary
> > * after the freeze is lifted, patches from the branch need to be cleaned up
> > and put on reviewboard if necessary according to our review policy. *
> > FreOffice development can continue in trunk
> > * we'll have a daily merge from trunk to the branch
> Please do NOT commit the same thing to both branch and trunk.
> 
> I'll fetch the commits from trunk around 8:00 cet every day. And committing 
> them to branch around 10:00 cet
> 
> These are apprx. times

Right -- I should have been more clear about that. Bugs that go into trunk will be \
merged, no need to commit it twice. If you commit it twice you'll make Casper (and \
my) life pretty difficult!

-- 
Boudewijn Rempt | http://www.valdyas.org
Ceterum censeo lapsum particulorum probae delendum esse
_______________________________________________
koffice-devel mailing list
koffice-devel@kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel


[prev in list] [next in list] [prev in thread] [next in thread]