Assertion error in delta.py (_compare_trees)

[James Westby]

[Apologies to Marius, sending to the list this time.]

On (01/03/07 21:53), Marius Gedminas wrote:
> I can reproduce it with this shell script.  It requires that you have
> both bzr 0.11 and 0.15 somewhere (change the alias definitions)
> 
>     #!/bin/sh
>     alias bzr11=/usr/bin/bzr
>     alias bzr15=~/src/bzr.dev/bzr
>     set -x
>     mkdir -p branch1
>     bzr11 init branch1
>     ln -s missing branch1/file1
>     bzr11 add branch1/file1
>     bzr11 ci branch1 -m "Add a symlink"
>     rm branch1/file1
>     mkdir branch1/file1
>     bzr11 ci branch1 -m "Try to convert a symlink to a directory" # <-- fails
>     bzr11 branch branch1 branch2
>     bzr15 ci branch1 -m "Convert a symlink to a directory"
>     (cd branch2 && bzr15 merge ../branch1)
>     bzr15 ci branch2 -m "Merge branch1" # <-- fails with AssertionError
> 
> BTW if I comment out the "bzr11 ci branch1 -m "Try to..."" line, I get the same
> error.

Thanks, that is very useful.

However you don't need two versions of bzr to do this, the current
bzr.dev can do it all by itself. I have attached a patch with a testcase
to demonstrate the problem (yes, I realise it's in the wrong location).

Thanks,

James

[P.S. This patch was brought to you from a dirstate based working tree.]

-- 
  James Westby   --    GPG Key ID: B577FE13    --     http://jameswestby.net/
  seccure key - (3+)k7|M*edCX/.A:n*N!>|&7U.L#9E)Tu)T0>AM - secp256r1/nistp256
-------------- next part --------------
A non-text attachment was scrubbed...
Name: testcase.diff
Type: text/x-diff
Size: 1330 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070302/fe6adf84/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070302/fe6adf84/attachment.pgp