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

[Matthieu Moy]

Sam Steingold <sds at gnu.org> writes:

> $ bzr pull
> Using saved location: http://bzr.xsteve.at/dvc/
> No revisions to pull.
> $ bzr merge
> Merging from remembered location http://bzr.xsteve.at/dvc/
> Nothing to do.
> $ bzr status
> pending merges:
>   Stefan Reichoer 2007-06-18 Merged the patches mentioned on the mailing
> li...

It seem you earlier did a no-op merge (like, merge from someone who
has just merged from you). Then, you have stg like this:

 upstream --o----o----o
             \       / \
              \     /   \
        you    o---o----current situation (not commited yet)

To cancel it, just "bzr revert" (but this will also revert all other
local changes if you have some).

To avoid the problem, next time, you can merge with "bzr merge
--pull", wich will fall back to "pull" if you are actually an ancestor
of the revision you're merging. Then, you'll end up with something
like:

 upstream --o----o----o <- you, after "bzr merge --pull"
             \       /
              \     /  
        you    o---o <- you, before "bzr merge --pull"


-- 
Matthieu