how do I get rid of "pending merges:"?

[Aaron Bentley]

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

Sam Steingold wrote:
> am I at the latest and greatest revision?

Yes.  The pull output tells you that you are up to date with
"http://bzr.xsteve.at/dvc/"

> if yes, why do I have "pending merges"?

It appears you did a merge when you should have done a pull.  Pull is a
mirroring operation.  It updates your local copy to the latest upstream
version.  That appears to be what you wanted.

Merge is used for keeping up-to-date when you are making changes (and
committing them).  After you merge, you should commit.

And to answer the subject line, "bzr revert" will clear pending merges.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGk/Rx0F+nu1YWqI0RAgizAJ0VCqATFHU1coSAe2aiYGhbN4uaTACfepqo
RmummF90f+eXlJfh7IDmtLQ=
=RRIO
-----END PGP SIGNATURE-----