[MERGE] fix iter_changes with pending merges [was: Assertion failure in _process_entry]

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Aaron Bentley wrote:
> John Arbash Meinel wrote:
>>> Aaron Bentley wrote:
> 
>>>> bzr: ERROR: exceptions.AssertionError: don't know how to compare
>>>> source_minikind='a', target_minikind='r'
> 
>>> There is certainly a case that needs to be handled. I'll try to get to
>>> it today. My best guess is that source = 'a' and target = 'r' is
>>> something that can just be skipped. Since we should hit it at a
>>> different time.

Here is a bundle that does that.  It actually treats all combinations of
'a' and 'r' as skippable.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFF8yap0F+nu1YWqI0RAmRfAJ90kWwaedGRbA9rsrzdLmGQnCcNFgCfa/OS
Tjvfl+g1S1D3r+GIDylwaDg=
=W7ih
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: fix-compare-pending.patch
Type: text/x-patch
Size: 13147 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070310/c6874fee/attachment-0001.bin