[MERGE] Three little fixes/cleanups

[Michael Ellerman]

Hey Bzristas,

Just three little fixes/cleanups.

http://michael.ellerman.id.au/files/bzr/fixes

 1476 Michael Ellerman  2005-12-08
      Raise NoSuchFile when someone tries to add a non-existant file.

 1475 Michael Ellerman  2005-12-08
      Simplify handling of DivergedBranches in cmd_pull()

 1474 Michael Ellerman  2005-12-08
      Catch bad options nicely.

cheers

-- 
Michael Ellerman
IBM OzLabs

email: michael:ellerman.id.au
inmsg: mpe:jabber.org
wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051209/0b8ae396/attachment.pgp