dolfin team mailing list archive

[Anders Logg <logg@xxxxxxxxx>]

On Wed, Feb 09, 2011 at 06:18:33PM +0100, Anders Logg wrote:
> On Wed, Feb 09, 2011 at 08:44:52AM -0800, Johan Hake wrote:
> > On Wednesday February 9 2011 04:56:09 Marie E. Rognes wrote:
> > > On 02/09/2011 01:55 PM, Garth N. Wells wrote:
> > > > I think that this is overkill. I don't mind the buildbot breaking (by
> > > > accident) as long as it's fixed quickly. What causes problems are major
> > > > changes that result in extended red periods, and during which other
> > > > breakages are unknowingly introduced. This type of development should
> > > > take place in a personal branch.
> > > >
> > > > I'm happy with minor changes, incremental development, bug fixes, etc,
> > > > to be added by developers directly to main (with the expectation that
> > > > tests have been run locally). The less merging the better.
> > >
> > > Agree!
> >
> > +
> >
> > If the real reason for the more complicated push policy was that you do not
> > like what other developer introduce ;), we could try to use the Blueprint
> > and/or email list more!
>
> I like the new "complicated" push policy (which is not so complicated,
> really) since it allows me to push the stuff I do quickly (often
> without testing) and not worrying about breaking anything.

In conclusion: I will try to follow the proposed merge policy but feel
free to follow a different approach (and feel the pain when you break
the main branch). :-)

I recommend using the merge request feature on Launchpad before
merging since it's an easy way to announce that a merge is happening
without needing to send an email.

--
Anders