[PATCH] merge handles missing local files correctly

[Aaron Bentley]

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

Michael Ellerman wrote:
> I keep hitting this when I do a pull? Sorry I haven't looked into it any 
> further.
> 
> bzrlib/merge_core.py:123: No global (inventory) found

Okay, I've fixed the bug and added test cases.

Unfortunately, that just means you'll get a different (and correct)
exception.  The root problem is that you're missing a file that merge
wants to modify.

To solve your problem, you don't need the patch, you just need to
restore the file (e.g. with bzr merge-revert).

> And pychecker finds these as well, although I've not hit them:

That's dead code.  I'll get rid of it soon.

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

iD8DBQFC1T8n0F+nu1YWqI0RAqwbAJ9WBoHivb+8kZBdeh3JOLcFt0g/xgCeJmsG
Qy5O9hxdMQpZjEW1S28UQpI=
=E6sR
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge-missing-this.patch
Type: text/x-patch
Size: 4150 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050713/8b33ce91/attachment.bin