[MERGE] Fix missing pending merges

[Jelmer Vernooij]

On Tue, 2006-06-27 at 18:30 +1000, Robert Collins wrote:
> 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.
My main reason for putting it in workingtree_implementations was that
that code is currently shared between all implementations (they all
inherit from WorkingTree), though nothing in the interface contract
obviously requires that pending merges are stored in a 'pending-merges'
file.

> 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.
Fixed in attached bundle.

Cheers,

Jelmer
-- 
Jelmer Vernooij <jelmer at samba.org> - http://samba.org/~jelmer/
-------------- 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/8da35904/attachment.pgp