X-Authentication-Warning:	delorie.com: mail set sender to geda-user-bounces using -f
X-Recipient:	geda-user AT delorie DOT com
Message-ID:	<5687809E.8040401@xs4all.nl>
Date:	Sat, 02 Jan 2016 08:47:42 +0100
From:	"Bert Timmerman (bert DOT timmerman AT xs4all DOT nl) [via geda-user AT delorie DOT com]" <geda-user AT delorie DOT com>
User-Agent:	Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.19) Gecko/20110429 Fedora/2.0.14-1.fc13 SeaMonkey/2.0.14
MIME-Version:	1.0
To:	geda-user AT delorie DOT com
Subject:	Re: [geda-user] Merging stuff. How to make it happen
References:	<CAC4O8c_p5bMB1cKzDEsQFSnbZvY3TgnczH94pO_qCoJmiv2iWQ AT mail DOT gmail DOT com>
In-Reply-To:	<CAC4O8c_p5bMB1cKzDEsQFSnbZvY3TgnczH94pO_qCoJmiv2iWQ@mail.gmail.com>
Reply-To:	geda-user AT delorie DOT com

Britton Kerin (britton DOT kerin AT gmail DOT com) [via geda-user AT delorie DOT com] wrote:
>
> I want to merge the more trivial branches I've worked on now.
>
> If there are more specific objections I'll fix or otherwise address 
> them as I have all the ones that have come up so far.
>
> I stopped by the last sprint briefly and asked about this.  It sounds 
> like there's no definite policy for deciding when to merge things.  I 
> therefore propose that the following conditions should always be 
> considered sufficient for a merge into the main devel branch:
>
>   * the person who wrote it says it's ready
>   * at least one other person has looked at the patch
>   * devel fixed or addressed any issues raised
>   * it doesn't remove any functionality
>   * it doesn't do anything known to be contentious
>
> Whatever exact policy we use, it would be useful if we could get 
> branches merged faster than currently.  Developers tend to move from 
> one initial issue to closely related ones that they discover while 
> working on the first.  The changes involved frequently overlap, which 
> makes maintaining them as separate parallel branches hard.  So with 
> slow merging you end up with big branches.  Big branches are generally 
> harder to manage, especially when using the rebase approach.
>
> Britton
Hi Britton,

Could you tell us which branches you consider ready for a merge and 
needs reviewed.

Kind regards,

Bert Timmerman.



BTW: a typical subject for the geda developer list.

- Raw text -