[MERGE] revised revert help text

[John Arbash Meinel]

Aaron Bentley wrote:
> 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
> 

v- This might be better as 'Revert file contents to a previous revision'

> Revert files to the last-committed version.
> 

v- Giving a list of files will only revert those files. If the revision
is not specified with '--revision' the last committed revision is used.

> 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.

^- It is actually '.~#~'

> 
> options:
>   --no-backup
>   -h, --help            show help message
>   -r ARG, --revision=ARG

What do you think about my proposed alterations?

John
=:->




-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060920/cc4d69be/attachment.pgp