|
|
146.
|
|
|
This will perform a merge of the destination revision (the tip of the 
branch, or the specified revision) into the working tree, and then make
that revision the basis revision for the working tree. |
|
|
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:1672
|
|
|
147.
|
|
|
You can use this to visit an older revision, or to update a working tree
that is out of date from its branch. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
Вы можете использовать это для того, чтобы увидеть старые ревизии или обновить рабочее дерево, которое устарело по отношению к своей ветке.
|
|
Translated and reviewed by
skybon
|
|
|
|
Located in
bzrlib/builtins.py:1676
|
|
|
148.
|
|
|
If there are any uncommitted changes in the tree, they will be carried
across and remain as uncommitted changes after the update. To discard
these changes, use 'bzr revert'. The uncommitted changes may conflict
with the changes brought in by the change in basis revision. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
При наличии не подтверждённых изменений в рабочем дереве,они будут осуществлены и оставлены как неподтвержденные после обновления. Чтобы отменить эти изменения используйте 'bzr revert'. Не подтверждённые изменения могут конфликтовать с изменениями, вызванными обновлением.
|
|
Translated and reviewed by
skybon
|
|
|
|
Located in
bzrlib/builtins.py:1679
|
|
|
149.
|
|
|
If the tree's branch is bound to a master branch, bzr will also update
the branch from the master. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:1684
|
|
|
150.
|
|
|
You cannot update just a single file or directory, because each Bazaar
working tree has just a single basis revision. If you want to restore a
file that has been removed locally, use 'bzr revert' instead of 'bzr
update'. If you want to restore a file to its state in a previous
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
out the old content of that file to a new location. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
Нельзя обновить только отдельный файл или директорию, поскольку каждое
рабочее дерево Bazaar имеет только одну базовую ревизию. Если вы хотите
восстановить файл, который был удалён на локальной машине, используйте
'bzr revert', а не 'bzr update'. Если вы хотите восстановить файл до
состояния в предыдущей ревизии, используйте 'bzr revert' с опцией '-r',
или используйте 'bzr cat', чтобы записать старое содержимое этого файла
в новое местоположение. |
|
Translated and reviewed by
Sergey Basalaev
|
|
|
|
Located in
bzrlib/builtins.py:1687
|
|
|
151.
|
|
|
The 'dir' argument, if given, must be the location of the root of a
working tree to update. By default, the working tree that contains the
current working directory is used. |
|
|
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.
|
|
|
|
|
Аргумент 'dir', если задан, должен указывать путь к корню
обновляемого рабочего дерева. По умолчанию, используется рабочее
дерево, в котором содержится текущая рабочая папка. |
|
Translated and reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:1694
|
|
|
152.
|
|
|
bzr update --revision takes exactly one revision
|
|
|
|
|
bzr update --revision принимает ровно одну ревизию
|
|
Translated and reviewed by
Sergey Basalaev
|
|
|
|
Located in
bzrlib/builtins.py:1710
|
|
|
153.
|
|
|
bzr update can only update a whole tree, not a file or subdirectory
|
|
|
|
|
bzr update может обновить только всё дерево, не файл или поддиректорию
|
|
Translated and reviewed by
Sergey Basalaev
|
|
|
|
Located in
bzrlib/builtins.py:1718
|
|
|
154.
|
|
|
Tree is up to date at revision {0} of branch {1}
|
|
|
|
|
Дерево в актуальной ревизии {0} ветви {1}
|
|
Translated and reviewed by
Sergey Basalaev
|
|
|
|
Located in
bzrlib/builtins.py:1749
|
|
|
155.
|
|
|
branch has no revision %s
bzr update --revision only works for a revision in the branch history |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
в ветви нет ревизии %s
bzr update --revision работает только для ревизий в истории ветви |
|
Translated and reviewed by
Sergey Basalaev
|
|
|
|
Located in
bzrlib/builtins.py:1765
|
