|
|
2052.
|
|
|
In this situation, Bazaar will cancel the move, and leave ``white`` in 
``black``. To resolve that kind of conflict, you just have to decide what
name should be retained for the directories 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:322
|
|
|
2053.
|
|
|
* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white``
in ``black``,
* ``--action=take-other`` will revert Bazaar choice and move ``black`` in
``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,
* ``--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:328
|
|
|
2054.
|
|
|
Non-directory parent
-------------------- |
|
|
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:336
|
|
|
2055.
|
|
|
Conflict: foo.new is not a directory, but has files in it.
Created directory.
|
|
|
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:341
|
|
|
2056.
|
|
|
This happens when one side has added files to a directory, and the other side
has changed the directory into a file or symlink. 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:344
|
|
|
2057.
|
|
|
$ bzr init
$ bzr mkdir foo
$ bzr commit -m "BASE"
$ bzr branch . ../other
$ rmdir foo
$ touch foo
$ bzr commit -m "THIS"
$ bzr mkdir ../other/foo/bar
$ 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:347
|
|
|
2058.
|
|
|
To resolve that kind of conflict, you have to decide what name should be
retained for the file, directory or symlink 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:358
|
|
|
2059.
|
|
|
* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and
``bzr add foo``,
* ``--action=take-other`` will issue ``bzr rm --force foo`` and
``bzr mv foo.new foo``,
* ``--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:363
|
|
|
2060.
|
|
|
MalformedTransform
------------------ |
|
|
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:371
|
|
|
2061.
|
|
|
It is possible (though very rare) for Bazaar to raise a MalformedTransform
exception. This means that Bazaar encountered a filesystem conflict that it was
unable to resolve. This usually indicates a bug. Please let us know if you
encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs
|
|
|
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:374
|
