dolfin team mailing list archive
-
dolfin team
-
Mailing list archive
-
Message #24940
Re: [noreply@xxxxxxxxxxxxx: [Branch ~dolfin-core/dolfin/1.0.x] Rev 6400: Remove hypre_amg from listed available preconditioners for Epetra backend.]
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 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?
Johan
> --
> Anders
>
> _______________________________________________
> 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