From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: What is the process for suggesting bug fixes and improvements
 (bugtracker vs gitbug) ?
Date: Wed, 12 Feb 2014 21:09:38 +0100
Message-ID: <1392235778.5657.12.camel@rice-oxley.tremer.info>
In-Reply-To: <F7B24F11-F2FD-4791-9DC2-096949D30383@i100.no>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7664007638647822030=="
List-Id: <development.lists.ipfire.org>

--===============7664007638647822030==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hi,

feel free to edit the wiki and add missing information.

Those trivial changes don't need to be rebased.

-Michael

On Wed, 2014-02-12 at 20:49 +0100, Alf H=C3=B8gemark wrote:
> Hi
> I will try to rebase my github pull requests to next branch then.
> Thans for the info about the branches, it should probably be put on wiki on=
 development page.
>=20
> Alf
>=20
> Den 12. feb. 2014 kl. 20:04 skrev Michael Tremer <michael.tremer(a)ipfire.o=
rg>:
>=20
> > Hi Alf,
> >=20
> > the different branches have the following purpose:
> >=20
> > master:
> > Is the branch with the code that is currently shipped (core update n).
> >=20
> > next:
> > The branch which is going to become the next release (core update n+1).
> >=20
> > On top of that, we sometimes have feature branches.
> >=20
> > Everything that is sent our way should be branched from and apply to
> > next. There might be some occasions where master is also suitable, but
> > next is the default.
> >=20
> > Best,
> > -Michael
> >=20
> > On Tue, 2014-02-11 at 18:34 +0100, Alf H=C3=B8gemark wrote:
> >> On 02/09/2014 03:01 PM, Michael Tremer wrote:
> >>>> Should I make an issue in the bug tracker for each of my pull
> >>>> requests ?
> >>>> Should I rather attach a patch to a bug tracker issue than issuing
> >>>> pull requests on github ?
> >>> Basically yes.
> >>>=20
> >>> This might depend a little bit on what the changes include, but I think
> >>> the bugtracker is the best option for most cases. You may still use your
> >>> GitHub repository and point to the branch that should be pulled. A set
> >>> of patches for each commit is also fine.
> >> Could you give some information about what branches you use on=20
> >> git.ipfire.org ?
> >> http://git.ipfire.org/?p=3Dipfire-2.x.git;a=3Dsummary
> >>=20
> >> I see the "next" branch, the "master" branch, "core75" branch and for=20
> >> example the "fifteen" branch.
> >> I haven't found information about that on the wiki.
> >> I would appreciate a few word about these branches.
> >>=20
> >> Will 2.15 be "core76" ?
> >>=20
> >> If I have some bug fixes for the current 2.13 core 75, what git branch=20
> >> should I work against ?
> >> The "core75"  branch?
> >>=20
> >> If I have some improvements that I think could maybe be part of 2.15,=20
> >> what git branch should I work against ?
> >>=20
> >>=20
> >> Regards
> >> Alf
> >=20


--===============7664007638647822030==--