Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 17142:3e66d00b3026 stable
rollback: move examples and --force note in help into verbose section
Plain 'hg help rollback' now looks like this:
$ hg help rollback
hg rollback
roll back the last transaction (dangerous)
This command should be used with care. There is only one level of
rollback, and there is no way to undo a rollback. It will also restore
the dirstate at the time of the last transaction, losing any dirstate
changes since that time. This command does not alter the working
directory.
Transactions are used to encapsulate the effects of all commands that
create new changesets or propagate existing changesets into a repository.
This command is not intended for use on public repositories. Once changes
are visible for pull by other users, rolling a transaction back locally
is ineffective (someone else may already have pulled the changes).
Furthermore, a race is possible with readers of the repository; for
example an in-progress pull from the repository may fail if a rollback is
performed.
Returns 0 on success, 1 if no rollback data is available.
options:
-n --dry-run do not perform actions, just print output
-f --force ignore safety measures
--mq operate on patch repository
use "hg -v help rollback" to show more info
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Wed, 11 Jul 2012 09:12:31 +0200 |
parents | b558c9fa39c1 |
children | c9e6c6ae4ea1 |
comparison
equal
deleted
inserted
replaced
17141:b558c9fa39c1 | 17142:3e66d00b3026 |
---|---|
4896 | 4896 |
4897 Transactions are used to encapsulate the effects of all commands | 4897 Transactions are used to encapsulate the effects of all commands |
4898 that create new changesets or propagate existing changesets into a | 4898 that create new changesets or propagate existing changesets into a |
4899 repository. | 4899 repository. |
4900 | 4900 |
4901 For example, the following commands are transactional, and their | 4901 .. container:: verbose |
4902 effects can be rolled back: | 4902 |
4903 | 4903 For example, the following commands are transactional, and their |
4904 - commit | 4904 effects can be rolled back: |
4905 - import | 4905 |
4906 - pull | 4906 - commit |
4907 - push (with this repository as the destination) | 4907 - import |
4908 - unbundle | 4908 - pull |
4909 | 4909 - push (with this repository as the destination) |
4910 To avoid permanent data loss, rollback will refuse to rollback a | 4910 - unbundle |
4911 commit transaction if it isn't checked out. Use --force to | 4911 |
4912 override this protection. | 4912 To avoid permanent data loss, rollback will refuse to rollback a |
4913 commit transaction if it isn't checked out. Use --force to | |
4914 override this protection. | |
4913 | 4915 |
4914 This command is not intended for use on public repositories. Once | 4916 This command is not intended for use on public repositories. Once |
4915 changes are visible for pull by other users, rolling a transaction | 4917 changes are visible for pull by other users, rolling a transaction |
4916 back locally is ineffective (someone else may already have pulled | 4918 back locally is ineffective (someone else may already have pulled |
4917 the changes). Furthermore, a race is possible with readers of the | 4919 the changes). Furthermore, a race is possible with readers of the |