dolfin team mailing list archive

[Anders Logg <logg@xxxxxxxxx>]

On Tue, Nov 08, 2011 at 01:55:44PM -0800, Johan Hake wrote:
> On Tuesday November 8 2011 13:51:14 Anders Logg wrote:
> > On Tue, Nov 08, 2011 at 01:46:20PM -0800, Johan Hake wrote:
> > > On Tuesday November 8 2011 13:41:40 Anders Logg wrote:
> > > > On Tue, Nov 08, 2011 at 01:25:24PM -0800, Johan Hake wrote:
> > > > > On Tuesday November 8 2011 13:14:50 Anders Logg wrote:
> > > > > > On Tue, Nov 08, 2011 at 12:52:03PM -0800, Johan Hake wrote:
> > > > > > > bzr cannot change commit messages on a branch, which I think git
> > > > > > > can. You need to uncommit the last commit.
> > > > > > >
> > > > > > >   $ bzr uncommit
> > > > > > >   $ #Add the back the altered file
> > > > > > >   $ bzr commit -m"New message"
> > > > > >
> > > > > > ok.
> > > > > >
> > > > > > It doesn't look like the buildbot is confused. It looks more like
> > > > > > the repository on Launchpad is misconfigured/broken:
> > > > > >
> > > > > > bzr pull http://bazaar.launchpad.net/~dolfin-core/dolfin/1.0.x
> > > > > > http://bazaar.launchpad.net/~dolfin-core/dolfin/1.0.x is
> > > > > > permanently redirected to
> > > > > > http://bazaar.launchpad.net/~dolfin-core/dolfin/1.0.x/changes
> > > > > > bzr: ERROR: These branches have diverged. Use the missing command
> > > > > > to see how.
> > > > > >
> > > > > > It works with
> > > > > >
> > > > > >   bzr pull lp:dolfin/1.0.x
> > > > > >
> > > > > > but not with
> > > > > >
> > > > > >   bzr pull http://bazaar.launchpad.net/~dolfin-core/dolfin/1.0.x
> > >
> > > I have no problems pulling from any of those branches. What is the error
> > > message, and have your repository divereged with the one you pull from?
> >
> > I get the same message as the buildbot except as a warning but not an
> > error.
>
> Ok, but can you pull from an empty repo, and/or just branch a new version of
> lp:dolfin/1.0.x. Then you can merge changes from your local 1.0.x branch into
> the newly established branch.

Yes, I'm sure that will work fine. I'm just curious what went wrong
and also a bit worried that something really is wrong and should be
fixed before we push more.

Plus my buildbot is yellow still so I'm not about to push right
now...

Btw, something is up with the web server. I just moved the domain to a
new DNS server today and as a result there seem to be temporary
glitches in the DNS lookup. It should fix itself.

--
Anders


> Johan
>
> > > > > > I don't know what that means.
> > > > >
> > > > > Ouch...
> > > > >
> > > > > Maybe it helps to remove:
> > > > >   http://bazaar.launchpad.net/~dolfin-core/dolfin/1.0.x
> > > > >
> > > > > and re-push it?
> > > >
> > > > That doesn't work:
> > > >
> > > > "This branch cannot be deleted as it has 41 branches sharing
> > > > revisions."
> > >
> > > Well, I guess that is a safty thing :) But then it does not make sense
> > > that
> > >
> > >   lp:dolfin/1.0.x
> > >
> > > works but not:
> > >   http://bazaar.launchpad.net/~dolfin-core/dolfin/1.0.x
> >
> > No idea what has happened here. Maybe Martin can explain? He usually
> > claims that he is a bzr expert. :-)
> >