LockContention error when pushing (with new tag) to a bound branch
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Fix Released
|
High
|
Andrew Bennetts | ||
bzr (Ubuntu) |
Fix Released
|
Undecided
|
Unassigned | ||
Natty |
Fix Released
|
High
|
Jelmer Vernooij |
Bug Description
I have three branches:
workspace (for my current work)
trunk (pushed to from workspace; used for builds)
backup (actually in a different drive)
trunk is bound to backup. All branches pass 'bzr check'
Since upgrading to 2.3.0, I've been unable to push from workspace to trunk. The problem is still in 2.3.1. The problem is *not* present in 2.2.4.
$ cd workspace
$ bzr --no-plugins push ../trunk
Unable to obtain lock file://
at chiclet.local [process #10732], acquired 0 seconds ago.
Will continue to try until 10:51:19, unless you press Ctrl-C.
See "bzr help break-lock" for more.
bzr: ERROR: Could not acquire lock "(local)": file://
I'll attach the bzr.log with -Dlock.
Unfortunately it seems to be something specific to this branch (or set of branches). I can't reproduce this with a synthetic example.
From trunk:
$ bzr info -v
Repository checkout (format: 2a)
Location:
repository checkout root: .
checkout of branch: /private/
shared repository: /private/tmp/tests
Related branches:
push branch: /Users/
parent branch: /private/
Format:
control: Meta directory format 1
working tree: Working tree format 6
branch: Branch format 7
repository: Repository format 2a - rich roots, group compression and chk inventories
In the working tree:
1762 unchanged
0 modified
0 added
0 removed
0 renamed
0 unknown
0 ignored
554 versioned subdirectories
Branch history:
910 revisions
552 days old
first revision: Fri 2009-09-04 19:13:48 -0400
latest revision: Thu 2011-03-03 17:09:56 -0500
Repository:
960 revisions
Related branches
- Martin Pool: Approve
- bzr-core: Pending requested
-
Diff: 184 lines (+99/-7)4 files modifiedbzrlib/branch.py (+11/-7)
bzrlib/tests/per_branch/test_branch.py (+67/-0)
bzrlib/tests/per_branch/test_push.py (+17/-0)
doc/en/release-notes/bzr-2.3.txt (+4/-0)
summary: |
- LockContention error when pushing to a bound branch + LockContention error when pushing (with new tag) to a bound branch |
Changed in bzr: | |
status: | Confirmed → In Progress |
Changed in bzr (Ubuntu): | |
status: | New → Fix Released |
Changed in bzr (Ubuntu Natty): | |
status: | New → In Progress |
Changed in bzr (Ubuntu Natty): | |
assignee: | nobody → Jelmer Vernooij (jelmer) |
importance: | Undecided → High |
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.