|
2042.
|
|
|
* ``move``: will move the orphans to a ``bzr-orphans`` directory at the root
of the working tree with names like ``<file>.~#~``.
|
|
|
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
en/help_topics/conflict-types.txt:273
|
|
2043.
|
|
|
Path conflict
-------------
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
en/help_topics/conflict-types.txt:278
|
|
2044.
|
|
|
Path conflict: PATH1 / PATH2
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
en/help_topics/conflict-types.txt:283
|
|
2045.
|
|
|
This happens when the source and target have each modified the name or parent
directory of a file. Bazaar will use the path elements from the source.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
en/help_topics/conflict-types.txt:285
|
|
2046.
|
|
|
To resolve that kind of conflict, you just have to decide what name should be
retained for the file involved.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
en/help_topics/conflict-types.txt:288
|
|
2047.
|
|
|
* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by
issuing ``bzr mv PATH2 PATH1``,
* ``--action=take-other`` will acknowledge Bazaar choice of keeping ``PATH2``,
* ``--action=done`` will just mark the conflict as resolved.
|
|
|
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
en/help_topics/conflict-types.txt:293
|
|
2048.
|
|
|
Parent loop
-----------
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
en/help_topics/conflict-types.txt:300
|
|
2049.
|
|
|
Conflict moving FILE into DIRECTORY. Cancelled move.
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
en/help_topics/conflict-types.txt:305
|
|
2050.
|
|
|
This happens when the source and the target have each moved directories, so
that, if the change could be applied, a directory would be contained by itself.
For example::
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
en/help_topics/conflict-types.txt:307
|
|
2051.
|
|
|
$ bzr init
$ bzr mkdir white
$ bzr mkdir black
$ bzr commit -m "BASE"
$ bzr branch . ../other
$ bzr mv white black
$ bzr commit -m "THIS"
$ bzr mv ../other/black ../other/white
$ bzr commit ../other -m "OTHER"
$ bzr merge ../other
|
|
|
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
en/help_topics/conflict-types.txt:311
|