dolfin team mailing list archive
-
dolfin team
-
Mailing list archive
-
Message #25508
Re: Merge problem
-
To:
Johannes Ring <johannr@xxxxxxxxx>
-
From:
Anders Logg <logg@xxxxxxxxx>
-
Date:
Fri, 2 Mar 2012 19:11:52 +0100
-
Authentication-results:
mr.google.com; spf=pass (google.com: domain of logg@xxxxxxxxx designates 10.112.8.129 as permitted sender) smtp.mail=logg@xxxxxxxxx
-
Cc:
dolfin-dev <dolfin@xxxxxxxxxxxxxxxxxxx>
-
In-reply-to:
<CALjQY_FwyJBbC1Juk1m=8UFXPB5Ba0F3qYZk85KOXzvG951U5A@mail.gmail.com>
-
User-agent:
Mutt/1.5.21 (2010-09-15)
On Thu, Mar 01, 2012 at 12:36:28PM +0100, Johannes Ring wrote:
> On Thu, Mar 1, 2012 at 12:20 PM, Joachim Berdal Haga <jobh@xxxxxxxxx> wrote:
> > On 1 March 2012 11:10, Joachim Berdal Haga <jobh@xxxxxxxxx> wrote:
> >> On 1 March 2012 09:49, Anders Logg <logg@xxxxxxxxx> wrote:
> >>> Failed:
> >>>
> >>> http://www.fenicsproject.org:8082/builders/dolfin-linux64-exp/builds/106/steps/dolfin%20build/logs/stdio
> >>
> >> dolfin/fem/SymmetricAssembler.cpp:217: error: no matching function for
> >> call to 'dolfin::AssemblerTools::init_global_tensor(dolfin::GenericMatrix&,
> >> const dolfin::Form&, int, bool&, bool&)'
> >> dolfin/fem/AssemblerTools.h:48: note: candidates are: static void
> >> dolfin::AssemblerTools::init_global_tensor(dolfin::GenericTensor&,
> >> const dolfin::Form&, bool, bool)
> >>
> >> Strange. I removed the int argument (which is no longer used) when I
> >> merged with trunk, it's not present in my branch. Which branch does
> >> the buildbot build from, can I have a look at it?
> >
> > I forgot CCs on this. Anyway, I've built
> > lp:~dolfin-core/dolfin/trunk-logg here now, with no problems. However,
> > the buildbot now says:
> > """
> > http://bazaar.launchpad.net/~dolfin-core/dolfin/trunk-logg is
> > permanently redirected to
> > http://bazaar.launchpad.net/~dolfin-core/dolfin/trunk-logg/changes
> > bzr: ERROR: These branches have diverged. Use the missing command to see how.
> > Use the merge command to reconcile them.
> > """
>
> I have removed the old branch now. The next time someone pushes the
> force build button, a new branch will be downloaded.
Looks like I'm having the same problem again. I removed my old branch
on Launchpad (trunk-logg) and replaced it with a new (so I could make
a merge from a clean trunk) and the buildbot is reporting the same
problem now.
--
Anders
Follow ups
References