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 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 Johan _______________________________________________ Mailing list: https://launchpad.net/~dolfin Post to : dolfin@lists.launchpad.net Unsubscribe : https://launchpad.net/~dolfin More help : https://help.launchpad.net/ListHelp
