Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@couchdb.apache.org
Received-SPF: neutral (nike.apache.org: local policy)
Content-Type: text/plain; charset=windows-1252
Mime-Version: 1.0 (Mac OS X Mail 6.2 \(1499\))
Subject: Re: branch names
From: Jan Lehnardt <jan@apache.org>
In-Reply-To: 
 <CAJNb-9o2MM2WZeOn==F1sXF59DX+aQrHX5cDNpYLCJxiqd7+xw@mail.gmail.com>
Date: Tue, 4 Dec 2012 19:33:49 +0100
Content-Transfer-Encoding: quoted-printable
Message-Id: <206C43BB-4E2F-4D9D-BC6D-85004D2F2ABB@apache.org>
References: <AC2CC180-8A8C-48D5-8FF8-AD3B8FC1E111@apache.org>
 <CAJNb-9o2MM2WZeOn==F1sXF59DX+aQrHX5cDNpYLCJxiqd7+xw@mail.gmail.com>
To: dev@couchdb.apache.org


On Dec 4, 2012, at 19:19 , Benoit Chesneau <bchesneau@gmail.com> wrote:

> On Tue, Dec 4, 2012 at 6:55 PM, Jan Lehnardt <jan@apache.org> wrote:
>=20
>> Hey all,
>>=20
>> just a heads up, the scheme for branch names we agreed on
>> is: 1532-feature-add-docs No underscores. Please follow
>> this.
>>=20
>> The fact that the cors branch doesn=92t follow this is a
>> historic artefact that I thought wasn=92t worth cleaning
>> up, but it looks I was wrong.
>>=20
>> =46rom now on, I will rule with an iron fist about getting
>> these details right. Current branches with diverging names
>> are exempt.
>>=20
>> Cheers
>> Jan
>> --
>>=20
>=20
> Actually we were agree to discuss that later a little more.

Nope, we made a decision:

=
http://mail-archives.apache.org/mod_mbox/couchdb-dev/201210.mbox/%3cDEC04D=
B0-172C-4517-8554-2BE049A2F606@apache.org%3e

that resulted in:=20

=
http://wiki.apache.org/couchdb/Merge_Procedure?action=3Ddiff&rev1=3D10&rev=
2=3D11

We can always change things as this is completely arbitrary. But we must =
stick
to one scheme. And I am tired of discussing this because we have a =
working
solution that doesn=92t warrant any more bikeshedding.


> I do think we should distinct the issue number from the rest. And =
using an
> underscore was good for that. Not a big deal though.

The issue number is always first and an integer, the issue type is =
always one
of "fix", "feature", or other type we come up with that is a single =
word,
everything else is the short description of the issue. there are no =
ambiguities
and things are pleasant to read.

I=92m happy to change this too all underscores, but not mixed. And we=92ve=
 been
through this and everyone who cared weighed in, so hyphens it is.


> Also something that wasn't discussed is how we distinct ticket or pr =
from
> github from the rest.  *If* this should be distinguished.

Please open a separate discussion on this.

Cheers
Jan
--=20