[MERGE] Fix missing pending merges

[Robert Collins]

On Tue, 2006-06-27 at 02:55 +0200, Jelmer Vernooij wrote:
> Hi,
> 
> 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.

+1 in principal.

Its been put in as a workingtree_implementations test, which means its
presumed to apply to all working tree formats. This is not the case
though, I know of at least two working tree implementations that do not
use pending-merge files at all, so deleting them will have no effect.

There is not a -great- place to put this test at the moment, because we
only have format specific tests and interface tests, as opposed to 'all
the working tree formats that use pending-merge files' groups of tests.

I suggest putting it in bzrlib/tests/test_workingtree.py though, using
an explicit tree construction of a working tree format 3 tree.

-Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060627/2efbf5d1/attachment.pgp