|
|
530.
|
|
|
The working tree contains a list of revisions that have been merged but 
not yet committed. These revisions will be included as additional parents
of the next commit. Normally, using revert clears that list as well as
reverting the files. If any files are specified, revert leaves the list
of uncommitted merges alone and reverts only the files. Use ``bzr revert
.`` in the tree root to revert all files but keep the recorded merges,
and ``bzr revert --forget-merges`` to clear the pending merge list without
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:4781
|
|
|
531.
|
|
|
Using "bzr revert --forget-merges", it is possible to apply all of the
changes from a branch in a single revision. To do this, perform the merge
as desired. Then doing revert with the "--forget-merges" option will keep
the content of the tree as it was, but it will clear the list of pending
merges. The next commit will then contain all of the changes that are
present in the other branch, but without any other parent revisions.
Because this technique forgets where these changes originated, it may
cause additional conflicts on later merges involving the same source and
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:4790
|
|
|
532.
|
|
|
Do not save backups of reverted files.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4804
|
|
|
533.
|
|
|
Remove pending merge marker, without changing any files.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4806
|
|
|
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:4837
|
|
|
535.
|
|
|
Show help on all commands.
|
|
|
|
|
Показать справку по всем командам.
|
|
Translated by
Yuri Matronov
|
|
Reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4842
|
|
|
536.
|
|
|
Show unmerged/unpulled revisions between two branches.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4871
|
|
|
537.
|
|
|
OTHER_BRANCH may be local or remote.
|
|
|
|
|
OTHER_BRANCH (другая ветка) может быть локальной или удаленной.
|
|
Translated and reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4873
|
|
|
538.
|
|
|
To filter on a range of revisions, you can use the command -r begin..end
-r revision requests a specific revision, -r ..end or -r begin.. are
also valid.
:Exit values:
1 - some missing revisions
0 - no missing revisions |
|
|
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.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4875
|
|
|
539.
|
|
|
Determine the missing revisions between this and the branch at the
remembered pull location::
|
|
|
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.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4885
|
