|
37.
|
|
|
Since a lightweight checkout is little more than a working tree
this will refuse to run against one.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
In Ubuntu: |
|
(not translated yet)
|
|
|
|
Located in
bzrlib/builtins.py:551
|
|
58.
|
|
|
--file-ids-from will try to use the file ids from the supplied path.
It looks up ids trying to find a matching parent directory with the
same filename, and then by pure path. This option is rarely needed
but can be useful when adding the same logical file into two
branches that will be merged later (without showing the two different
adds as a conflict). It is also useful when merging another project
into a subdirectory of this one.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
In Ubuntu: |
|
--file-ids-from versucht die Datei-IDs des angegebenen Pfades zu benutzen.
Hiermit werden die Datei-IDs verglichen und gemeinsame Elternverzeichnisse
des selben Namen, danach des selben Pfades, gesucht. Diese Option wird selten benötigt,
kann aber sehr hilfreich sein, wenn die selbe Datei in zwei Zweige eingefügt wird, die
später zusammengeführt werden (ohne dabei das doppelte Hinzufügen als Konflikt auszugeben).
Außerdem ist diese Option hilfreich, wenn ein anderes Projekt in ein Unterverzeichnis
eingefügt wird.
|
|
|
Suggested by
Hendrik Schrieber
|
|
|
|
Located in
bzrlib/builtins.py:776
|
|
72.
|
|
|
If OLDNAME does not exist on the filesystem but is versioned and
NEWNAME does exist on the filesystem but is not versioned, mv
assumes that the file has been manually moved and only updates
its internal inventory to reflect that change.
The same is valid when moving many SOURCE files to a DESTINATION.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:971
|
|
84.
|
|
|
By default, 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) into the
parent.
|
|
|
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:1104
|
|
85.
|
|
|
If branches have diverged, you can use 'bzr merge' to integrate the changes
from one into the other. Once one branch has merged, the other should
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:1109
|
|
87.
|
|
|
If there is no default location set, the first pull will set it (use
--no-remember to avoid setting it). After that, you can omit the
location to use the default. To change the default, use --remember. The
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)
|
In Ubuntu: |
|
Wird kein Standardverzeichnis angegeben, wird dies mit dem ersten Abgleich definiert
(benutzen Sie --no-remember, um es nicht zu definieren). Danach können Sie
das Standardverzeichnis bei der Voreinstellung belassen. Benutzen Sie --remember, um den
Standard zu ändern . Der Wert wird nur gespeichert, wenn die Gegenstelle erreichbar ist.
|
|
|
Suggested by
Hendrik Schrieber
|
|
|
|
Located in
bzrlib/builtins.py:1117
|
|
88.
|
|
|
The --verbose option will display the revisions pulled using the log_format
configuration option. You can use a different format by overriding it with
-Olog_format=<other_format>.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
In Ubuntu: |
|
Die Option --verbose zeigt die heruntergeladenen Versionen unter Benutzung der
log_format-Konfiguration an. Sie können ein anderes Format verwenden, indem Sie
es mit -Olog_format=<Anderes_Format> überschreiben.
|
|
|
Suggested by
Hendrik Schrieber
|
|
|
|
Located in
bzrlib/builtins.py:1122
|
|
89.
|
|
|
Note: The location can be specified either in the form of a branch,
or in the form of a path to a file containing a merge directive generated
with bzr send.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
In Ubuntu: |
|
Beachten Sie: Das Verzeichnis kann in Form eines Zweiges oder in Form
eines Pfades angegeben werden, in dem sich eine bei der bzr-Übertragung
entstandene Zusammenführungsanweisung befindet.
|
|
|
Suggested by
Hendrik Schrieber
|
|
|
|
Located in
bzrlib/builtins.py:1126
|
|
91.
|
|
|
Branch to pull into, rather than the one containing the working directory.
|
|
|
|
(no translation yet)
|
In Ubuntu: |
|
Zweig, in den an Stelle des aktuellen Arbeitsverzeichnisses heruntergeladen wird.
|
|
|
Suggested by
Hendrik Schrieber
|
|
|
|
Located in
bzrlib/builtins.py:1136
|
|
93.
|
|
|
No working tree, ignoring --show-base
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:1188
|