confusing messages

Aaron Bentley aaron.bentley at utoronto.ca
Thu Mar 1 18:06:48 GMT 2007


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

James Westby wrote:
> On (01/03/07 09:42), Sam Steingold wrote:
>> $ bzr status
>> pending merges:
>>   Stefan Reichoer 2007-01-29 Applied minor fix for dvc-build.el from 
>> Sascha...

>> So, I am still confused: what do I need to do to shut "bzr status" up?
> 
> As Aaron said you can do bzr revert. This will get rid of the pending
> merge, along with the change that you merged.
> 
> However it seems like this is not what you want, you wnat to have that
> change. In that case you should merge and commit.

I noticed that there were no file changes listed in his "status" output,
so I expect he does not want the change at all.

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

iD8DBQFF5xY40F+nu1YWqI0RAr6ZAJ4lLlQcP/kir11fLyTpr0VibjQ4gwCeIVFy
LlhN8YnSZ1gUfcKUVYZGzYM=
=wFDN
-----END PGP SIGNATURE-----



More information about the bazaar mailing list