|
|
92.
|
|
|
Perform a local pull in a bound branch. Local pulls are not applied to the master branch.
|
|
|
|
|
バインドブランチに対してpullする場合に、マスターブランチには反映しないようにします。
|
|
Translated by
IWATA Hidetaka
|
|
|
|
Located in
bzrlib/builtins.py:1139
|
|
|
93.
|
|
|
Need working tree for --show-base.
|
|
|
|
|
--show-baseオプションを使用するには作業ツリーが必要です。
|
|
Translated by
IWATA Hidetaka
|
|
|
|
Located in
bzrlib/builtins.py:1168
|
|
|
94.
|
|
|
No pull location known or specified.
|
|
|
|
|
pull対象ブランチが指定されていません。
|
|
Translated by
IWATA Hidetaka
|
|
|
|
Located in
bzrlib/builtins.py:1184
|
|
|
95.
|
|
|
Using saved parent location: %s 
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
デフォルトの親ブランチを使用します。: %s
|
|
Translated and reviewed by
IWATA Hidetaka
|
|
|
|
Located in
bzrlib/builtins.py:1190
|
|
|
96.
|
|
|
Cannot use -r with merge directives or bundles
|
|
|
|
|
マージディレクティブやバンドルに対して-rを使用することはできません。
|
|
Translated by
IWATA Hidetaka
|
|
|
|
Located in
bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
|
|
|
97.
|
|
|
Update a mirror of this branch.
|
|
|
|
|
このブランチのミラーを更新します。
|
|
Translated by
IWATA Hidetaka
|
|
|
|
Located in
bzrlib/builtins.py:1238
|
|
|
98.
|
|
|
The target branch will not have its working tree populated because this
is both expensive, and is not supported on remote file systems. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
対象のブランチの作業ツリーの更新はコストが高く、リモートファイルシステムでは
サポートされていないため、作業ツリーの更新は行いません。 |
|
Translated by
IWATA Hidetaka
|
|
|
|
Located in
bzrlib/builtins.py:1240
|
|
|
99.
|
|
|
Some smart servers or protocols *may* put the working tree in place in
the future. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
将来的に、作業ツリーの更新ができるようなスマートサーバやプロトコルがリリース
*かもしれません*。 |
|
Translated by
IWATA Hidetaka
|
|
|
|
Located in
bzrlib/builtins.py:1243
|
|
|
100.
|
|
|
This command only works on branches that have not diverged. Branches are
considered diverged if the destination branch's most recent commit is one
that has not been merged (directly or indirectly) by the source branch. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
このコマンドは、分岐していないブランチ同士でのみ使用できます。push先ブランチ
の最新のコミットが(直接的、もしくは間接的に)push元のブランチにまだマージされて
いない状態の場合に、ブランチが分岐しているとみなされます。 |
|
Translated by
IWATA Hidetaka
|
|
Reviewed by
IWATA Hidetaka
|
|
|
|
Located in
bzrlib/builtins.py:1246
|
|
|
101.
|
|
|
If branches have diverged, you can use 'bzr push --overwrite' to replace
the other branch completely, discarding its unmerged changes. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
ブランチ同士が分岐している場合、 'bzr push --overwrite' で、まだマージされて
いない変更を破棄してpush先のブランチを完全に置きかえることができます。 |
|
Translated by
IWATA Hidetaka
|
|
Reviewed by
IWATA Hidetaka
|
|
|
|
Located in
bzrlib/builtins.py:1250
|
