traceback in smart server on jaunty in bzr 1.14rc2

Bug #365277 reported by Barry Warsaw
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Bazaar
New
Undecided
Unassigned

Bug Description

I just tried to merge my branch lp:~barry/launchpad/gpr-ui into a pristine launchpad/devel (rocketfuel) branch and got the following traceback.

https://pastebin.canonical.com/16688/

Aaron suggested prefixing the url with nosmart+ and that allowed me to complete the merge. This is on bzr 1.14rc2 on a recently upgraded-to-jaunty machine.

Revision history for this message
John A Meinel (jameinel) wrote :

Isn't this just a dup of bug #354036 ? With the observation that when the branch was *created* with a different version of bzr, it is "already broken", and a newer client doesn't fix that...

I could argue about whether it is broken or not. We changed how we determine what file texts to transfer to be friendlier to ghosts, but it means we now need the full inventory for all *parents* of revisions that are in the stacked branch, which wasn't previously necessary.

We could change it a few ways:

1) If parents aren't available, fall back to iterating the deltas and including file texts that are referenced. This will fail in the presence of ghosts, but we've gotten along with doing it this way for a long time.
2) Allow for *some* parents to be available even if all are not. If we can find any parents, then we can still do the 'set difference' that we want to do. It just results in transmitting a few extra texts that we don't absolutely need to transfer. I suppose we'd run into a problem that the stacked on branch doesn't have those texts (they are in the fallback), because the client new they weren't needed when it pushed.

Revision history for this message
Barry Warsaw (barry) wrote :

Isn't it "broken" by definition any time it tracebacks?

In any event, yes, this is a duplicate of bug #354036. Thanks for the pointer.

Revision history for this message
Robert Collins (lifeless) wrote : Re: [Bug 365277] Re: traceback in smart server on jaunty in bzr 1.14rc2

On Wed, 2009-04-22 at 21:33 +0000, Barry Warsaw wrote:

> Isn't it "broken" by definition any time it tracebacks?

Well yes, but John meant 'the branch is missing important data', not
'bzr is broken' :)

-Rob

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.