baz-import-branch: unexpected conflicts

[John Arbash Meinel]

Ben Finney wrote:
> Howdy all,
> 
> [Replies only to the discussion forum please, I subscribe via NNTP.]
> 
> I'm trying to convert a branch from baz to bzr, but it's failing with
> the following output.
> 
> =====
> $ bzr --version | head -n 1
> bzr (bazaar-ng) 0.8.2
> $ baz --version | head -n 1
> baz Bazaar version 1.4.2 (thelove at canonical.com/dists--bazaar--1.4[bazaar--devo.cfg])
> $ aptitude show pybaz | grep Version:
> Version: 1.5pre1-2
> 
> $ bzr baz-import-branch www.benfinney.id.au/ ben at benfinney.id.au--bignose-2005/websites--mainline--0
> importing ben at benfinney.id.au--bignose-2005/websites--mainline--0 into /home/bignose/Projects/websites/www.benfinney.id.au
> Cleaning up
> bzr: ERROR: pybaz.errors.ExecProblem: baz exited with code 2 (expected exit code 0)
> argv: 'get', 'ben at benfinney.id.au--bignose-2005/websites--mainline--0--base-0', '/home/bignose/Projects/websites/baz2bzr--86oZQ/rd'
> * error report
> * Scanning for full-tree revision: ....
> * from revision library (linking): ben at benfinney.id.au--bignose-2005/websites--mainline--0--patch-2
> * Applying 2 revisions (in reverse): ..****************************************************

^--- So this is actually what is causing problems. It is reverse
applying the changes from patch-4 back to patch-2. And isn't patch-4 the
one that has a content change? (A file changed into a symlink, or vice
versa).

v-- But this is also of concern. I don't know if there is something
weird with your revision library, or what. But it shouldn't get a
conflict while building the revision.

> 5 conflicted items in this tree. Please
> resolve each conflict with baz "resolved 'filename'"
> ****************************************************
> baz: uncaught exception: -1:(conflict applying patch in arch_build_revision)
>   please report this as a bug to bazaar at lists.canonical.com
>   at /usr/lib/python2.4/site-packages/pybaz/backends/forkexec.py line 361
>   in wait
> =====
> 
> At abentley's suggestion, I used 'baz replay' to attempt to isolate
> the problem. The resulting script is below. (File and directory names
> have been changed in this message since this relates to a website that
> I'd rather not have publicly disclosed.)
> 
> Note that the above 'baz-import-branch' output doesn't seem concerned
> with any revision past patch-2.
> 
> =====
> Script started on Wed 23 Aug 2006 13:42:13 EST
> 
> $ baz get ben at benfinney.id.au--bignose-2005/websites--mainline--0--patch-1
> * ensuring library has ben at benfinney.id.au--bignose-2005/websites--mainline--0--patch-1
> * Scanning for full-tree revision: ....
> * from revision library (linking): ben at benfinney.id.au--bignose-2005/websites--mainline--0--patch-2
> * Applying 1 revisions (in reverse): .
> * Scanning for full-tree revision: ..
> * from revision library: ben at benfinney.id.au--bignose-2005/websites--mainline--0--patch-1
> * tree version set ben at benfinney.id.au--bignose-2005/websites--mainline--0--patch-1
> 

Looking at the first error more closely, you actually need to get the
'--base-0' revision, not the patch-1. It might be a bug between base-0
and patch-1 which is causing all of your problems.

One other thing you can try, would be to rename your revision library to
something else, so that Baz doesn't try to re-use it, and see if that helps.

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060825/2c648ade/attachment.pgp