confusing messages

[Aaron Bentley]

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

Sam Steingold wrote:
> James Westby wrote:
>> On (28/02/07 12:07), Sam Steingold wrote:
>>
>>> $ bzr status
>>> pending merges:
>>>   Stefan Reichoer 2007-01-29 Applied minor fix for dvc-build.el from
> Sascha...
>>
>> This means that you have done a merge from the other branch, but haven't
>> done the last step of committing it. This step is required as you are
>> supposed to ensure that the merge happened as you wanted. You then make
>> a commit to say that you are happy with the current state and want to
>> carry on.
> 
> This appears to imply that I need to do "bzr commit" after "bzr update".

No, in general you only need to commit after "merge", not "update".  It
seems as though you did a "merge" a while ago, didn't commit, and then
did "update" after the merge.

The only case where you need to commit after "update" is if
1. You have done local commits
2. The master branch had commits after your last update

This is because two sets of changes happened in parallel, and they need
to be reconciled.

> $ bzr missing
> Using last location: http://bzr.xsteve.at/dvc/
> You have 1 extra revision(s):
> 
> # this appears to imply that the master branch has 136 revisions,
> # while mine has 137 revisions, which is not good.

Yes, that is what it means.

> So, I am still confused: what do I need to do to shut "bzr status" up?

$ bzr revert

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

iD8DBQFF5u2n0F+nu1YWqI0RAhz5AJwP9ywkjJQkfn+91juKbcK0CM+XigCeKeaS
BUpEM8bVUvn1Ed806h+dkjk=
=QZoi
-----END PGP SIGNATURE-----