Re: [Libreoffice] Release and feature branches in the repos

2010-10-11 Thread Jan Holesovsky
Hi Caolan, On 2010-10-08 at 14:18 +0100, Caolán McNamara wrote: > > Nevertheless, there was agreement on the IRC that we will allow feature > > branches even in the main repos; but in that case, they have to be > > prefixed with 'feature/' prefix. Also, the creator of the branch is > > supposed

Re: [Libreoffice] Release and feature branches in the repos

2010-10-08 Thread Kohei Yoshida
On Fri, 2010-10-08 at 14:18 +0100, Caolán McNamara wrote: > On Fri, 2010-10-08 at 14:43 +0200, Jan Holesovsky wrote: > > > Nevertheless, there was agreement on the IRC that we will allow feature > > branches even in the main repos; but in that case, they have to be > > prefixed with 'feature/' pre

Re: [Libreoffice] Release and feature branches in the repos

2010-10-08 Thread Caolán McNamara
On Fri, 2010-10-08 at 14:43 +0200, Jan Holesovsky wrote: > Nevertheless, there was agreement on the IRC that we will allow feature > branches even in the main repos; but in that case, they have to be > prefixed with 'feature/' prefix. Also, the creator of the branch is > supposed to remove it whe

[Libreoffice] Release and feature branches in the repos

2010-10-08 Thread Jan Holesovsky
Hi, This is a proposal how to handle the feature and release branches in the LibreOffice git repos. Terms - "Release branch" - branch that is used for a release of a version, like when we start stabilizing 3.3, we'll create libreoffice-3-3 branch, and only fixes targeting 3.3 are supposed to