dolfin team mailing list archive

[Johan Hake <johan.hake@xxxxxxxxx>]

On Wednesday June 1 2011 15:08:00 Anders Logg wrote:
> On Wed, Jun 01, 2011 at 02:22:53PM -0700, Johan Hake wrote:
> > On Wednesday June 1 2011 14:00:31 Anders Logg wrote:
> > > I'm having problems with my repository. bzr claims there's a lock and
> > > breaking it doesn't seem to help. This happened also yesterday and I
> > > then removed my Launchpad repository and replaced it with a new one.
> > > 
> > > Here's my setup:
> > > 
> > > .../dolfin/      -  collection of repositories (bzr init-repo)
> > > .../dolfin/trunk -  repository bound to lp:dolfin (bzr checkout)
> > > .../dolfin/logg  -  repository bound to lp:~dolfin-core/dolfin/logg
> > 
> > > Here's the steps I follow:
> > Why not:
> >   cd trunk
> >   bzr up
> >   cd ../logg
> >   bzr pull ../trunk
> 
> Yes, those are the steps I usually follow (but sometimes forget)
> before I proceed with the steps I listed.

Ok.

> >   <work>
> >   bzr commit
> >   <wait for buildbot to turn green>
> >   cd ../trunk
> >   bzr up
> >   # If changes in trunk
> >   
> >      bzr merge ../logg
> >      bzr commit -m "merge logg"
> >   
> >   # If no changes in trunk
> >   
> >      bzr pull ../logg
> 
> The only difference I see from what I do is pulling directly instead
> of merging. I actually do that too, but in a slightly different way.
> 
>   <work in logg>
>   bzr commit
>   bzr push lp:dolfin
> 
> Only if that fails (if lp:dolfin has changed) do I cd into trunk and
> do the merge.

Ok.

> Since my trunk branch is bound to lp:dolfin, will the last step be
> equivalent to
> 
>   bzr push ../trunk
> 
> ?

Yes, that is how I understands it, and it works fine for me :)

Johan

> --
> Anders
> 
> > The last pull will update launchpad
> > 
> > >   cd logg
> > >   <work>
> > >   bzr commit
> > >   <wait for buildbot to turn green>
> > >   cd ../trunk
> > >   bzr merge ../logg
> > >   bzr commit -m "merge logg"
> > >   cd ../logg
> > >   bzr pull ../trunk
> > > 
> > > Here's what happens:
> > > 
> > > $ bzr pull ../trunk
> > > 
> > >  Unable to obtain lock  held by logg@xxxxxxxxxxxxxxxxxxxx
> > >  at crowberry [process #5041], acquired 14 seconds ago.
> > >  See "bzr help break-lock" for more.
> > >  bzr: ERROR: Could not acquire lock "(remote lock)":
> > >  bzr+ssh://bazaar.launchpad.net/~dolfin-core/dolfin/logg/
> > > 
> > > $ bzr break-lock
> > > bzr+ssh://bazaar.launchpad.net/~dolfin-core/dolfin/logg/ $ bzr pull
> > > ../trunk
> > > 
> > >  Unable to obtain lock  held by logg@xxxxxxxxxxxxxxxxxxxx
> > >  at crowberry [process #6538], acquired 14 seconds ago.
> > >  See "bzr help break-lock" for more.
> > >  bzr: ERROR: Could not acquire lock "(remote lock)":
> > >  bzr+ssh://bazaar.launchpad.net/~dolfin-core/dolfin/logg/
> > > 
> > > Has anyone else experienced this?
> > 
> > Nope and I follow the above mentioned steps.
> > 
> > Johan