|
|
494.
|
|
|
bzr merge /tmp/merge
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
|
bzr merge /tmp/merge
|
|
Translated by
gavenkoa
|
|
Reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4335
|
|
|
495.
|
|
|
To create a merge revision with three parents from two branches 
feature1a and feature1b:
|
|
|
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:4337
|
|
|
496.
|
|
|
bzr merge ../feature1a
bzr merge ../feature1b --force
bzr commit -m 'revision with three parents'
|
|
|
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.
|
|
|
|
|
bzr merge ../feature1a
bzr merge ../feature1b --force
bzr commit -m 'ревизия с тремя родителями'
|
|
Translated by
Sergej セルゲイ
|
|
Reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4340
|
|
|
497.
|
|
|
Merge even if the destination tree has uncommitted changes.
|
|
|
|
|
Выполнить слияние даже если дерево назначения имеет незафиксированные изменения.
|
|
Translated and reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4352
|
|
|
498.
|
|
|
Apply uncommitted changes from a working copy, instead of branch changes.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4358
|
|
|
499.
|
|
|
If the destination is already completely merged into the source, pull from the source rather than merging. When this happens, you do not need to commit the result.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4360
|
|
|
500.
|
|
|
Branch to merge into, rather than the one containing the working directory.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4365
|
|
|
501.
|
|
|
Instead of merging, show a diff of the merge.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4367
|
|
|
502.
|
|
|
Select changes interactively.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4369
|
|
|
503.
|
|
|
Merging into empty branches not currently supported, https://bugs.launchpad.net/bzr/+bug/308562
|
|
|
|
|
Слияние в пустые ветки в настоящее время не поддерживается, https://bugs.launchpad.net/bzr/+bug/308562
|
|
Translated by
Yuri Matronov
|
|
Reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4391
|
