[MERGE] Two little fixes/cleanups

[Robert Collins]

On Sat, 2005-12-10 at 16:13 -0600, Michael Ellerman wrote:

> I've ripped out that last patch and update the other two, so it's now:
> 
>  1475 Michael Ellerman  2005-12-10
>       Raise NoSuchFile when someone tries to add a non-existant file.
> 
>  1474 Michael Ellerman  2005-12-10
>       Simplify handling of DivergedBranches in cmd_pull()
> 

Merged to integration - thanks.

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: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051215/c78663a0/attachment.pgp