[MERGE] revised revert help text

[Aaron Bentley]

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

John Arbash Meinel wrote:
> v- This might be better as 'Revert file contents to a previous revision'

It's not just the contents, though, it's also paths, metadata and
versioning.

I referred to "last-committed", because I thought that it would be
helpful for people who were looking for something like the revert
command, but didn't know what it was called.

As a compromise:
- ---
Revert files 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.

How about:
- --
Giving a list of files will revert only those files.  Otherwise, all
files will be reverted.  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 '.~#~'

Sure.

>>options:
>>  --no-backup
>>  -h, --help            show help message
>>  -r ARG, --revision=ARG
> 
> 
> What do you think about my proposed alterations?

What do you think about my proposed alteration alterations? :-)

We could also go into a bit more detail on specifying files:
- ---
When you provide files, you can use their current pathname or the
pathname from the target revision.  So you can use revert to 'undelete'
a file by name.  If you name a directory, all the contents of that
directory will be reverted.
- ---

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

iD8DBQFFEWg00F+nu1YWqI0RAmSpAJoCWO6ccte7nTcFjinsiSpUlb88BgCfTJDm
uhDv7jOH+UvIzCauKUPk9Fk=
=7XH9
-----END PGP SIGNATURE-----