[ANNOUNCE] bzrtools-54 [PATCH] allow tracking a baz project

[John A Meinel]

John A Meinel wrote:
...

> I'm having some problems with the tree that I am trying to merge,
> though. If I do the normal update and rename, it seems to be okay, but
> when I try to do the 'merge' route, I get an exception about an id not
> having a path associated with.

...

Well, I've tracked down the problem to a specific version. (I think).
Specifically this patch:
    john at johnmeinel.com--2004/mifar-all--CVS-dev--0.7--patch-67
It involves a renamed directory, and then some modifications of the
contents of the directory.

I haven't figured out the specific problem, but bzr complains about not
being able to find the path for the inventory id of the renamed directory.
I tried to create a test example of a similar situation, but it didn't
seem to exhibit the bug.

I patched bzr.dev mainline with the attached patch, so I could track
down what id was failing.

To reproduce this, you could use the following steps, using the latest
version of baz2bzr (with the patches I gave you):

# this should succeed, there are 75 patches between the import and
--patch-66
baz2bzr --max-count=75 john at johnmeinel.com--2004/mifar-all--CVS-dev--0.7
mifar-dev
# You can have max-count equal anything, you just have to cross the
patch-67 boundary
baz2bzr --max-count=1 john at johnmeinel.com--2004/mifar-all--CVS-dev--0.7
mifar-dev

Unfortunately on the machine which is hosting these patches, baz2bzr is
pretty slow. So it takes me a while to test things.
I also put the -patch-66 version up as both a bzr repository, and a
tarball available at:
http://bzr.arbash-meinel.com/bzr-merge-failure/

If you don't try to do a merge, it is able to get past this location, so
I also put up a version with --patch-67.

Now I *can* do:
cd mifar-dev-p66
bzr merge ../mifar-dev-p67 ./@

And it seems to apply the rename. Though I don't see the changes to the
files.

What is weird, is that I did this:

cp -a mifar-dev-p66 mifar-dev-p66-test
cd mifar-dev-p66-test
bzr merge ../mifar-dev-p67 ./@
cd ..
diff -ur --exclude '*.bzr*' mifar-dev-p66-test mifar-dev-p67
# No changes
diff -ur mifar-dev-p66-test/clients/pocky mifar-dev-p66/clients/pocmark
# Changes
cd mifar-dev-p66-test
bzr status
# Lots of renames, no modified files, it seems that bzr status cannot
represent a
# file as both renamed & modified.
Though when I do the commit, it does indeed notice that the files were
modified.

Anyway, I'm just trying to figure out what is going on, why I am getting
a missing path for a given Inventory.

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: show-missing-id.patch
Type: text/x-patch
Size: 820 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050603/b180a9c1/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 253 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050603/b180a9c1/attachment.pgp