Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 15744:5a20115e7397 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rollback: clarify --force text (issue3175)
author Matt Mackall <mpm@selenic.com>
date Thu, 29 Dec 2011 14:02:18 -0600
parents 32a6e00e4cfe
children e251250ac20b 1ef46bcd76f8
comparison
equal deleted inserted replaced
15743:6266b1b970a5 15744:5a20115e7397
4861 - import 4861 - import
4862 - pull 4862 - pull
4863 - push (with this repository as the destination) 4863 - push (with this repository as the destination)
4864 - unbundle 4864 - unbundle
4865 4865
4866 It's possible to lose data with rollback: commit, update back to 4866 To avoid permanent data loss, rollback will refuse to rollback a
4867 an older changeset, and then rollback. The update removes the 4867 commit transaction if it isn't checked out. Use --force to
4868 changes you committed from the working directory, and rollback 4868 override this protection.
4869 removes them from history. To avoid data loss, you must pass
4870 --force in this case.
4871 4869
4872 This command is not intended for use on public repositories. Once 4870 This command is not intended for use on public repositories. Once
4873 changes are visible for pull by other users, rolling a transaction 4871 changes are visible for pull by other users, rolling a transaction
4874 back locally is ineffective (someone else may already have pulled 4872 back locally is ineffective (someone else may already have pulled
4875 the changes). Furthermore, a race is possible with readers of the 4873 the changes). Furthermore, a race is possible with readers of the