LockContention error when pushing (with new tag) to a bound branch

If I've used bisect correctly, the bug appears to have been introduced in the following change:

On revision 5050.53.1 (<email address hidden>):
Tags.merge_to now updates the master branch as well, if any.

Here's a synthetic example demonstrating the problem:

[/tmp/ex]$ bzr init a b c
bzr: ERROR: extra argument to command init: b

[/tmp/ex]$ bzr init a
Created a standalone tree (format: 2a)

[/tmp/ex]$ bzr init b
Created a standalone tree (format: 2a)

[/tmp/ex]$ bzr init c
Created a standalone tree (format: 2a)

[/tmp/ex]$ cd b

[/tmp/ex/b]$ bzr bind ../a

[/tmp/ex/b]$ cd ../c

[/tmp/ex/c]$ :>foo; bzr add; bzr commit -m 'Commit #1'
adding foo
Committing to: /private/tmp/ex/c/
added foo
Committed revision 1.

[/tmp/ex/c]$ bzr tag tag1
Created tag tag1.

[/tmp/ex/c]$ bzr push ../b
Unable to obtain lock file:///private/tmp/ex/a/ held by Brian de Alwis <email address hidden>
at chiclet.local [process #12112], acquired 0 seconds ago.
Will continue to try until 11:41:14, unless you press Ctrl-C.
See "bzr help break-lock" for more.
^Cbzr: interrupted

mgz pointed out on irc that the RelatedBranches section of 'bzr info -v' looked a bit fishy. This was some extraneous information in the branch.conf from when I branched the original branches. Removing the push and parent branch pointers makes no difference.

Can reproduce the failure here, does seem to be a bug 603395 regression.

Given that this is a regression in 2.3.0, I'm going to bump this to High.

Fixed in lp:bzr/2.3 r5629. The fix will be included in the 2.3.2 release.

Has Andrew's fix been pulled into the mainline? I still see this error in bzr 2.4b1:

$ bzr push
/usr/pkg/lib/python2.6/site-packages/bzrlib/plugins/git/__init__.py:142: DeprecationWarning: Modifying dwim_revspecs was deprecated in version 2.4.0.
  dwim_revspecs.append(RevisionSpec_git)
ControlDirFormat.register_format() has been removed in Bazaar 2.4. Please upgrade your plugins.
Using saved push location: /Users/bsd/Manumitting/Projects/Capiche/dev/trunk/
Unable to obtain lock file:///Users/bsd/Manumitting/Projects/Capiche/repo/trunk/ held by Brian de Alwis <email address hidden>
at chiclet.local [process #54749], acquired 0 seconds ago.
Will continue to try until 07:50:15, unless you press Ctrl-C.
See "bzr help break-lock" for more.
^Cbzr: interrupted

It is in mainline, but it landed there a few revs after 2.4b1 was made. It'll be in 2.4b2.

Sorry, I meant to check that before I submitted. Thank you!

Brian.

On 2011-03-31, at 9:10 PM, Andrew Bennetts <email address hidden> wrote:

> It is in mainline, but it landed there a few revs after 2.4b1 was made.
> It'll be in 2.4b2.
>
> --
> You received this bug notification because you are a direct subscriber
> of the bug.
> https://bugs.launchpad.net/bugs/733350
>
> Title:
> LockContention error when pushing (with new tag) to a bound branch
>
> To unsubscribe from this bug, go to:
> https://bugs.launchpad.net/bzr/+bug/733350/+subscribe

Accepted bzr into natty-proposed, the package will build now and be available in a few hours. Please test and give feedback here. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation how to enable and use -proposed. Thank you in advance!

Hello Brian, or anyone else affected,

Accepted bzr into natty-proposed, the package will build now and be available in a few hours. Please test and give feedback here. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation how to enable and use -proposed. Thank you in advance!

Verified by running the bzr testsuite from the package in a clean natty install.

This bug was fixed in the package bzr - 2.3.4-0ubuntu1

---------------
bzr (2.3.4-0ubuntu1) natty-proposed; urgency=low

  * New upstream release.
   + Fix bzr version number in deprecation warnings. LP: #794960
   + Prevent write attemps on remote branch during "bzr up". LP: #786980
   + Fix conflict handling when two trees involved in a merge have different
     root ids. LP: #805809

bzr (2.3.3-0ubuntu1) natty-proposed; urgency=low

  * New upstream release.
   + Fixes deprecation warning on newer versions of Python. LP: #760435
   + Stops 'bzr push' from copying entire repository if a .bzr directory is
     present without a branch. LP: #465517
   + Fixes undefined local variable error when waiting for lock. LP: #733136
   + Fixes lock contention issues pushing to a bound branch. LP: #733350
   + Transfers less data creating a new stacked branch. LP: #737234
   + Several fixes to the test suite, making it more robust. LP: #654733,
      LP: #751824
   + 'bzr merge --pull --preview' actually shows a preview rather than
     actually merging. LP: #760152
   + bzr smart server now supports UTF-8 user names. LP: #659763
   + user identity can now be set based on username and /etc/mailname, not
     requiring it to be set manually. LP: #616878
   + stacking is now fully transitive. LP: #715000
   + makes in-terminal crash report of plugins much shorter. LP: #716389
 -- Jelmer Vernooij <email address hidden> Thu, 14 Jul 2011 21:12:58 +0200