|
85.
|
|
|
If branches have diverged, you can use 'bzr merge' to integrate the changes ![](/@@/translation-newline)
from one into the other. Once one branch has merged, the other should ![](/@@/translation-newline)
be able to pull it again.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:1121
|
|
86.
|
|
|
If you want to replace your local changes and just want your branch to ![](/@@/translation-newline)
match the remote one, use pull --overwrite. This will work even if the two ![](/@@/translation-newline)
branches have diverged.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:1125
|
|
87.
|
|
|
If there is no default location set, the first pull will set it (use ![](/@@/translation-newline)
--no-remember to avoid setting it). After that, you can omit the ![](/@@/translation-newline)
location to use the default. To change the default, use --remember. The ![](/@@/translation-newline)
value will only be saved if the remote location can be accessed.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:1129
|
|
88.
|
|
|
The --verbose option will display the revisions pulled using the log_format ![](/@@/translation-newline)
configuration option. You can use a different format by overriding it with ![](/@@/translation-newline)
-Olog_format=<other_format>.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:1134
|
|
89.
|
|
|
Note: The location can be specified either in the form of a branch, ![](/@@/translation-newline)
or in the form of a path to a file containing a merge directive generated ![](/@@/translation-newline)
with bzr send.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:1138
|
|
90.
|
|
|
Show logs of pulled revisions.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:1146
|
|
91.
|
|
|
Branch to pull into, rather than the one containing the working directory.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:1148
|
|
92.
|
|
|
Perform a local pull in a bound branch. Local pulls are not applied to the master branch.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:1151
|
|
93.
|
|
|
No working tree, ignoring --show-base
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:1188
|
|
94.
|
|
|
No pull location known or specified.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:1204
|