[MERGE][BUG #93412] 'bzr uncommit --local'

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Aaron Bentley wrote:
| John Arbash Meinel wrote:
|> I should mention that one way this differs from 'bzr commit --local' is
|> that it is not an error to supply 'bzr uncommit --local' in a branch
|> that is not bound. I did it that way because it was both easier, and
|> because I didn't understand why commit --local should raise an error in
|> that case.
|
| So this means that when you think you're working in a heavyweight
| checkout, and uncommitting from that, you can accidentally uncommit from
| the real branch instead.
|
| I think that's a bad idea.  I think that it's quite plausible for
| someone to have a lightweight checkout but think they have a heavyweight
| one.
|
| Aaron

I'm don't think I agree, but it is easy enough to code, and I would hate to have
the same "we don't have feature X because we didn't agree on it" happen to
uncommit --local.

So here is a patch which causes 'uncommit --local' to raise the same exception
as 'commit --local' when you have an unbound branch.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFH4n7PJdeBCYSNAAMRAkGIAJ9b2ZMd+wYYaaWGp4KvHaJn8pVw8QCfbKIE
1OvFCSo8SL8i0x9Pfsc6Zl0=
=LdyX
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: uncommit_local.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20080320/b0b3f4f5/attachment-0001.diff