Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 17145:f7152a0d90df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew-stable
author Martin Geisler <mg@aragost.com>
date Thu, 12 Jul 2012 10:41:56 +0200
parents 8fa8717b47b6 71e36b3d2cc4
children 4b33422e2572
comparison
equal deleted inserted replaced
17139:ad1b5e070f16 17145:f7152a0d90df
4980 any dirstate changes since that time. This command does not alter 4980 any dirstate changes since that time. This command does not alter
4981 the working directory. 4981 the working directory.
4982 4982
4983 Transactions are used to encapsulate the effects of all commands 4983 Transactions are used to encapsulate the effects of all commands
4984 that create new changesets or propagate existing changesets into a 4984 that create new changesets or propagate existing changesets into a
4985 repository. For example, the following commands are transactional, 4985 repository.
4986 and their effects can be rolled back: 4986
4987 4987 .. container:: verbose
4988 - commit 4988
4989 - import 4989 For example, the following commands are transactional, and their
4990 - pull 4990 effects can be rolled back:
4991 - push (with this repository as the destination) 4991
4992 - unbundle 4992 - commit
4993 4993 - import
4994 To avoid permanent data loss, rollback will refuse to rollback a 4994 - pull
4995 commit transaction if it isn't checked out. Use --force to 4995 - push (with this repository as the destination)
4996 override this protection. 4996 - unbundle
4997
4998 To avoid permanent data loss, rollback will refuse to rollback a
4999 commit transaction if it isn't checked out. Use --force to
5000 override this protection.
4997 5001
4998 This command is not intended for use on public repositories. Once 5002 This command is not intended for use on public repositories. Once
4999 changes are visible for pull by other users, rolling a transaction 5003 changes are visible for pull by other users, rolling a transaction
5000 back locally is ineffective (someone else may already have pulled 5004 back locally is ineffective (someone else may already have pulled
5001 the changes). Furthermore, a race is possible with readers of the 5005 the changes). Furthermore, a race is possible with readers of the
5693 Update the repository's working directory to the specified 5697 Update the repository's working directory to the specified
5694 changeset. If no changeset is specified, update to the tip of the 5698 changeset. If no changeset is specified, update to the tip of the
5695 current named branch and move the current bookmark (see :hg:`help 5699 current named branch and move the current bookmark (see :hg:`help
5696 bookmarks`). 5700 bookmarks`).
5697 5701
5702 Update sets the working directory's parent revison to the specified
5703 changeset (see :hg:`help parents`).
5704
5698 If the changeset is not a descendant or ancestor of the working 5705 If the changeset is not a descendant or ancestor of the working
5699 directory's parent, the update is aborted. With the -c/--check 5706 directory's parent, the update is aborted. With the -c/--check
5700 option, the working directory is checked for uncommitted changes; if 5707 option, the working directory is checked for uncommitted changes; if
5701 none are found, the working directory is updated to the specified 5708 none are found, the working directory is updated to the specified
5702 changeset. 5709 changeset.
5703
5704 Update sets the working directory's parent revison to the specified
5705 changeset (see :hg:`help parents`).
5706 5710
5707 The following rules apply when the working directory contains 5711 The following rules apply when the working directory contains
5708 uncommitted changes: 5712 uncommitted changes:
5709 5713
5710 1. If neither -c/--check nor -C/--clean is specified, and if 5714 1. If neither -c/--check nor -C/--clean is specified, and if
5719 2. With the -c/--check option, the update is aborted and the 5723 2. With the -c/--check option, the update is aborted and the
5720 uncommitted changes are preserved. 5724 uncommitted changes are preserved.
5721 5725
5722 3. With the -C/--clean option, uncommitted changes are discarded and 5726 3. With the -C/--clean option, uncommitted changes are discarded and
5723 the working directory is updated to the requested changeset. 5727 the working directory is updated to the requested changeset.
5728
5729 To cancel an uncommitted merge (and lose your changes), use
5730 :hg:`update --clean .`.
5724 5731
5725 Use null as the changeset to remove the working directory (like 5732 Use null as the changeset to remove the working directory (like
5726 :hg:`clone -U`). 5733 :hg:`clone -U`).
5727 5734
5728 If you want to revert just one file to an older revision, use 5735 If you want to revert just one file to an older revision, use