|
525.
|
|
|
Giving a list of files will revert only those files. Otherwise, all files ![](/@@/translation-newline)
will be reverted. If the revision is not specified with '--revision', the ![](/@@/translation-newline)
working tree basis revision is used. A revert operation affects only the ![](/@@/translation-newline)
working tree, not any revision history like the branch and repository or ![](/@@/translation-newline)
the working tree basis revision.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4751
|
|
526.
|
|
|
To remove only some changes, without reverting to a prior version, use ![](/@@/translation-newline)
merge instead. For example, "merge . -r -2..-3" (don't forget the ".") ![](/@@/translation-newline)
will remove the changes introduced by the second last commit (-2), without ![](/@@/translation-newline)
affecting the changes introduced by the last commit (-1). To remove ![](/@@/translation-newline)
certain changes on a hunk-by-hunk basis, see the shelve command. ![](/@@/translation-newline)
To update the branch to a specific revision or the latest revision and ![](/@@/translation-newline)
update the working tree accordingly while preserving local changes, see the ![](/@@/translation-newline)
update command.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4757
|
|
527.
|
|
|
Uncommitted changes to files that are reverted will be discarded. ![](/@@/translation-newline)
Howver, by default, any files that have been manually changed will be ![](/@@/translation-newline)
backed up first. (Files changed only by merge are not backed up.) Backup ![](/@@/translation-newline)
files have '.~#~' appended to their name, where # is a number.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4766
|
|
528.
|
|
|
When you provide files, you can use their current pathname or the pathname ![](/@@/translation-newline)
from the target revision. So you can use revert to "undelete" a file by ![](/@@/translation-newline)
name. If you name a directory, all the contents of that directory will be ![](/@@/translation-newline)
reverted.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4733
|
|
529.
|
|
|
If you have newly added files since the target revision, they will be ![](/@@/translation-newline)
removed. If the files to be removed have been changed, backups will be ![](/@@/translation-newline)
created as above. Directories containing unknown files will not be ![](/@@/translation-newline)
deleted.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4738
|
|
530.
|
|
|
The working tree contains a list of revisions that have been merged but ![](/@@/translation-newline)
not yet committed. These revisions will be included as additional parents ![](/@@/translation-newline)
of the next commit. Normally, using revert clears that list as well as ![](/@@/translation-newline)
reverting the files. If any files are specified, revert leaves the list ![](/@@/translation-newline)
of uncommitted merges alone and reverts only the files. Use ``bzr revert ![](/@@/translation-newline)
.`` in the tree root to revert all files but keep the recorded merges, ![](/@@/translation-newline)
and ``bzr revert --forget-merges`` to clear the pending merge list without ![](/@@/translation-newline)
reverting any files.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4743
|
|
531.
|
|
|
Using "bzr revert --forget-merges", it is possible to apply all of the ![](/@@/translation-newline)
changes from a branch in a single revision. To do this, perform the merge ![](/@@/translation-newline)
as desired. Then doing revert with the "--forget-merges" option will keep ![](/@@/translation-newline)
the content of the tree as it was, but it will clear the list of pending ![](/@@/translation-newline)
merges. The next commit will then contain all of the changes that are ![](/@@/translation-newline)
present in the other branch, but without any other parent revisions. ![](/@@/translation-newline)
Because this technique forgets where these changes originated, it may ![](/@@/translation-newline)
cause additional conflicts on later merges involving the same source and ![](/@@/translation-newline)
target branches.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4752
|
|
532.
|
|
|
Do not save backups of reverted files.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4766
|
|
533.
|
|
|
Remove pending merge marker, without changing any files.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4768
|
|
534.
|
|
|
Show help on a command or other topic.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
Показать справку по команде или другой теме.
|
|
Translated by
Yuri Matronov
|
|
Reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4799
|