← Back to team overview

dolfin team mailing list archive

Re: Syncing trunk and 1.0.x

 

On Wed, Nov 16, 2011 at 07:52:34AM +0000, Garth N. Wells wrote:
>
>
> On 16 Nov 2011, at 06:42, Anders Logg <logg@xxxxxxxxx> wrote:
>
> > On Tue, Nov 15, 2011 at 09:44:36PM -0800, Johan Hake wrote:
> >> I see that some recent fixes for the stable branch are not merged into trunk.
> >> I think we should have a policy to always merge with trunk whenever we commit
> >> something to the stable branch.
> >
> > Agree, but there have been problems with the fixes submitted over the
> > last couple of days. The buildbot was broken for some time, and my
> > personal buildbot was either timing out or was offline.
>
> Just use your own computer as a buildbot. 'make runtests'.

I can't. It's busy doing other things. But I always test first on my
personal buildbot before merging with an official branch (when
possible).

--
Anders


> Garth
>
>
>
> > Johannes has
> > moved my buildbot to another server which will help.
> >


References