[MERGE] revised revert help text

[Aaron Bentley]

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

Hi all,

This patch attempts to clarify what revert does and doesn't do.  Of
course, I'm really the last person who should be writing this, so any
help is greatly appreciated.

The revised text is:

usage: bzr revert [FILE...]
aliases: merge-revert

Revert files to the last-committed version.

Only versioned files are affected.  Specify filenames to revert only
those files.  To revert files to a different revision, specify --revision.

To remove only some changes, without reverting to a prior version, use
merge instead.  For example, "merge . --r-2..-3" will remove the changes
introduced by -2, without affecting the changes introduced by -1.  Or
to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.

By default, any files that have been manually changed will be backed up
first.  (Files changed only by merge are not backed up.)  Backup files have
'~#~' appended to their name, where # is a number.

options:
  --no-backup
  -h, --help            show help message
  -r ARG, --revision=ARG
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFFEU+e0F+nu1YWqI0RAoqoAJ47Rk+wCnLvi75+x+fSi5r39irDjACfXNww
lHaYWj1om1To0hz/jGSFvHg=
=3FLM
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: revert-help.patch
Type: text/x-patch
Size: 1747 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060920/4ec1367e/attachment.bin