ERROR: These branches have diverged.

[Aaron Bentley]

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

Sam Steingold wrote:
> 1. if I have local uncommitted changes, I think pull (or something
> else?) will fail.

Pull will not fail.  It was intended to work that way.  Merge would
fail, but you won't need it[1].

> 2. ok, now that I screwed up things by local commits, how do I recover?

If you have a checkout, "bzr pull --overwrite", and then reapply your
patch.  Otherwise, "bzr uncommit".

Aaron

[1] "merge --force" will merge even with uncommitted changes, but it's
highly unusual to do that.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGB/Kv0F+nu1YWqI0RAgbLAJ4lhfxiLan6d5VC8sCtKGVE3ZSBGQCggpqa
8uDF1CMsewK93xHiqXsbDZo=
=mgc8
-----END PGP SIGNATURE-----