[MERGE] Fix missing pending merges

Jelmer Vernooij jelmer at samba.org
Tue Jun 27 01:55:18 BST 2006


WorkingTree.pending_merges() was checking for the wrong exception. This
exception fixes this and adds a test. 

Modern checkouts, however, will always have a 'pending-merges' file. So
alternatively, this check could be removed altogether.


Jelmer Vernooij <jelmer at samba.org> - http://samba.org/~jelmer/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-missing-pending-merges.bundle.diff
Type: text/x-patch
Size: 1810 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060627/31bb77a1/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060627/31bb77a1/attachment.pgp 

More information about the bazaar mailing list