Show More
@@ -4982,18 +4982,22 b' def rollback(ui, repo, **opts):' | |||||
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 | |
@@ -5695,15 +5699,15 b' def update(ui, repo, node=None, rev=None' | |||||
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 |
|
5710 | |||
5704 | Update sets the working directory's parent revison to the specified |
|
|||
5705 | changeset (see :hg:`help parents`). |
|
|||
5706 |
|
||||
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 | |||
@@ -5722,6 +5726,9 b' def update(ui, repo, node=None, rev=None' | |||||
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. | |
5724 |
|
5728 | |||
|
5729 | To cancel an uncommitted merge (and lose your changes), use | |||
|
5730 | :hg:`update --clean .`. | |||
|
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 |
@@ -1185,7 +1185,7 b' class gitsubrepo(abstractsubrepo):' | |||||
1185 | return True |
|
1185 | return True | |
1186 | else: |
|
1186 | else: | |
1187 | self._ui.warn(_('no branch checked out in subrepo %s\n' |
|
1187 | self._ui.warn(_('no branch checked out in subrepo %s\n' | |
1188 | 'cannot push revision %s') % |
|
1188 | 'cannot push revision %s\n') % | |
1189 | (self._relpath, self._state[1])) |
|
1189 | (self._relpath, self._state[1])) | |
1190 | return False |
|
1190 | return False | |
1191 |
|
1191 |
General Comments 0
You need to be logged in to leave comments.
Login now