← Back to team overview

dolfin team mailing list archive

Re: Merging into trunk

 

On Thu, Nov 17, 2011 at 12:24:50PM +0000, Garth N. Wells wrote:
> On 17 November 2011 12:19, Anders Logg <logg@xxxxxxxxx> wrote:
> > On Thu, Nov 17, 2011 at 12:12:58PM +0000, Garth N. Wells wrote:
> >> On 17 November 2011 11:28, Anders Logg <logg@xxxxxxxxx> wrote:
> >> > Do we have any policy on testing before merging into trunk?
> >> >
> >>
> >> It's *much* easier if merges are frequent. Keeping numerous changes in
> >> a personal branch and pushing later is making work for others to fix
> >> the merge.
> >
> > Agree, but frequent merging requires frequent testing and testing
> > takes a long time which means less frequent testing and thus less
> > frequent merging... + I'm currently focusing only on 1.0.x.
> >
> >> > We currently don't have any buildbots for trunk (but plan to add in
> >> > the near future).
> >> >
> >>
> >> Just run 'make runtests'
> >
> > I can't afford it at the moment, or I'm overly pessimistic about the
> > time it takes to run the test. How long does it take on your laptop?
> >
>
> No very long. Also add -jxx to speed up the compilation.

I'm testing now.

> It's often a near certainty that particular changes will not break
> anything. Running
>
>   make run_unittests
>
> will just run the unit tests, which is fast.

What about

  make run_quicktest

?

--
Anders




> Garth
>
> >
> >
> >
> >> Garth
> >>
> >> >
> >> > On Thu, Nov 17, 2011 at 10:57:13AM +0000, Garth N. Wells wrote:
> >> >> When pushing changes to the 1.0 branch, please also merge into trunk.
> >> >> This is much easier than dealing with merge conflicts from many change
> >> >> sets.
> >> >>
> >> >> Garth
> >> >>
> >> >> _______________________________________________
> >> >> Mailing list: https://launchpad.net/~dolfin
> >> >> Post to     : dolfin@xxxxxxxxxxxxxxxxxxx
> >> >> Unsubscribe : https://launchpad.net/~dolfin
> >> >> More help   : https://help.launchpad.net/ListHelp
> >> >
> >


Follow ups

References