merge-upstream fails if top directory includes version number

Bug #810564 reported by Jonathan Riddell
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
bzr-builddeb
Incomplete
Medium
Unassigned

Bug Description

I manually created a new package stored in bzr, this ended up being in a directory libdbusmenu-qt-0.2.0

for a new release I updated with
> bzr merge-upstream --version 0.3.0 http://launchpad.net/libdbusmenu-qt/trunk/0.3.0/+download/libdbusmenu-qt-0.3.0.tar.bz2

This failed because it changed the directory name half way through and I ended up with a broken lock.

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

I can't reproduce this with the following steps:

bzr init /tmp/libdbusmenu-qt-0.2.0
cd /tmp/libdbusmenu-qt-0.2.0
bzr merge-upstream --package libdbusmenu-qt --version 0.3.0 http://launchpad.net/libdbusmenu-qt/trunk/0.3.0/+download/libdbusmenu-qt-0.3.0.tar.bz2

What did you do?

Changed in bzr-builddeb:
status: New → Incomplete
Revision history for this message
Jonathan Riddell (jr) wrote :

I started with a new repository with 0.2.0

wget http://launchpad.net/libdbusmenu-qt/trunk/0.2.0/+download/libdbusmenu-qt-0.2.0.tar.bz2
tar xf libdbusmenu-qt-0.2.0.tar.bz2
cd libdbusmenu-qt-0.2.0
bzr init .
bzr add
bzr commit -m "new package"
bzr dh-make libdbusmenu-qt 0.2.0 ../libdbusmenu-qt-0.2.0.tar.bz2
bzr add debian
bzr commit -m "packaging"
bzr merge-upstream --package libdbusmenu-qt --version 0.3.0 http://launchpad.net/libdbusmenu-qt/trunk/0.3.0/+download/libdbusmenu-qt-0.3.0.tar.bz2

bzr: ERROR: Lock was broken while still open: LockDir(file:///home/jr/src/libdbusmenu-qt/udd-test/libdbusmenu-qt-0.2.0/.bzr/branch/lock) - check storage consistency!

Jonathan Riddell (jr)
Changed in bzr-builddeb:
status: Incomplete → New
Jelmer Vernooij (jelmer)
Changed in bzr-builddeb:
status: New → Triaged
importance: Undecided → Medium
Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) wrote :

This seems to have improved at some point. I can no longer reproduce this following the steps provided by Jonathan.

Changed in bzr-builddeb:
status: Triaged → Incomplete
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.