[MERGE] Fix missing pending merges

[Jelmer Vernooij]

On Tue, 2006-06-27 at 10:50 +0200, Jelmer Vernooij wrote:
> 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.
> > 
> [...]
> Fixed in attached bundle.
Once again, this time _with_ bundle.

Cheers,

Jelmer

-- 
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: 4095 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060627/bdaa5e55/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/bdaa5e55/attachment.pgp