dolfin team mailing list archive

[Florian Rathgeber <florian.rathgeber@xxxxxxxxxxxxxx>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 06/06/11 11:43, Martin Sandve Alnæs wrote:
> On 6 June 2011 12:21, Anders Logg <logg@xxxxxxxxx> wrote:
>> On Mon, Jun 06, 2011 at 12:11:56PM +0200, Martin Sandve Alnæs wrote:
>>> On 2 June 2011 00:10, Johan Hake <johan.hake@xxxxxxxxx> wrote:
>>>> 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 :)
>>>
>>> Yes, but note that pushing to a repository with a working tree is unsafe.
>>> Better to pull, but bazaar might stop you anyway.
>>
>> Thanks, I will try that.
>>
>>> Break-lock has worked for me before, the two times I've had the same problem.
>>
>> It doesn't work for me. I'm experiencing the same issue now with the
>> fenics-book repository. I get an error message about not being able to
>> acquire look, but it looks like the push still goes through. At least
>> the commit messages end up on the mailing list.
>>
>> --
>> Anders
>>
> 
> Just a random permutation, have you tried using lp: notation with bzr
> break-lock?
> 
> bzr break-lock lp:~logg/fenics-book/mybranch
> 
> Shouldn't make any difference, but this shouldn't be a problem either...
> 
> Also, at
>   http://doc.bazaar.canonical.com/latest/en/user-reference/break-lock-help.html
> it says
>   You can get information on what locks are open via the ‘bzr info
> [location]’ command.
> Tried that?

If you haven't already, try bzr break-lock --force

I had this problem with a hiccup on the launchpad side before and it was
necessary to force breaking the lock.

Florian
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEARECAAYFAk3s5ogACgkQ8Z6llsctAxbeAgCeKw5U+i+9tKg8KQwFlU8VfTHK
2gMAoKy4RgU/OueHqCk30hYvHQnyHrjC
=+dX5
-----END PGP SIGNATURE-----

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature