Rev 4670: Tweak once more. in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/conflict-manager/

------------------------------------------------------------
revno: 4670
revision-id: v.ladeuil+lp at free.fr-20100204132934-r22jz2dkcfagojct
parent: v.ladeuil+lp at free.fr-20100204130401-droqjyqwbnmfq84t
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: dont-add-conflict-helpers
timestamp: Thu 2010-02-04 14:29:34 +0100
message:
  Tweak once more.
-------------- next part --------------
=== modified file 'bzrlib/help_topics/en/conflict-types.txt'
--- a/bzrlib/help_topics/en/conflict-types.txt	2010-02-04 13:04:01 +0000
+++ b/bzrlib/help_topics/en/conflict-types.txt	2010-02-04 13:29:34 +0000
@@ -28,11 +28,11 @@
 
 Whatever the conflict is, resolving it is roughly done in two steps::
 
- * modify the working tree content so that the conflicted item is now in the
-   state you want to keep,
+- modify the working tree content so that the conflicted item is now in the
+  state you want to keep,
 
- * inform Bazaar that the conflict is now solved and ask to cleanup any
-   remaining generated information (``bzr resolve <item>``).
+- inform Bazaar that the conflict is now solved and ask to cleanup any
+  remaining generated information (``bzr resolve <item>``).
 
 For most conflict types, there are some obvious ways to modify the working
 tree and put it into the desired state. For some types of conflicts, Bazaar
@@ -126,9 +126,9 @@
 
 ``bzr resolve`` recognizes the following actions:
 
- * ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,
- * ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,
- * ``--action=done`` will just mark the conflict as resolved.
+- ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,
+- ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,
+- ``--action=done`` will just mark the conflict as resolved.
 
 Any action will also delete the previously generated ``.BASE``, ``.THIS`` and
 ``.OTHER`` files if they are still present in the working tree.
@@ -174,9 +174,9 @@
 
 ``bzr resolve`` recognizes the following actions::
 
- * ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved FILE``,
- *  ``--action=take-other`` will issue ``bzr rm FILE.moved``,
- * ``--action=done`` will just mark the conflict as resolved.
+- ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved FILE``,
+- ``--action=take-other`` will issue ``bzr rm FILE.moved``,
+- ``--action=done`` will just mark the conflict as resolved.
 
 Note that you must get rid of FILE.moved before using ``--action=done``.
 
@@ -215,11 +215,10 @@
 
 ``bzr resolve`` recognizes the following actions::
 
- * ``--action=take-this`` will issue ``bzr rm directory``
-   including the children,
- * ``--action=take-other`` will acknowledge Bazaar choice to keep
-   the children and restoring the directory,
- * ``--action=done`` will just mark the conflict as resolved.
+- ``--action=take-this`` will issue ``bzr rm directory`` including the children,
+- ``--action=take-other`` will acknowledge Bazaar choice to keep the children
+  and restoring the directory,
+- ``--action=done`` will just mark the conflict as resolved.
 
 Bazaar cannot auto-detect when conflicts of this kind have been resolved.
 
@@ -239,10 +238,10 @@
 
 ``bzr resolve`` recognizes the following actions::
 
- * ``--action=take-this`` will acknowledge Bazaar choice to keep the directory,
- * ``--action=take-other`` will issue ``bzr rm directory`` including the 
-   children,
- * ``--action=done`` will just mark the conflict as resolved.
+- ``--action=take-this`` will acknowledge Bazaar choice to keep the directory,
+- ``--action=take-other`` will issue ``bzr rm directory`` including the 
+  children,
+- ``--action=done`` will just mark the conflict as resolved.
 
 Bazaar cannot auto-detect when conflicts of this kind have been resolved.
 
@@ -261,10 +260,10 @@
 
 ``bzr resolve`` recognizes the following actions::
 
- * ``--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.
+- ``--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.
 
 Bazaar cannot auto-detect when conflicts of this kind have been resolved.
 
@@ -277,7 +276,7 @@
 
 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:
+For example::
 
   $ bzr init
   $ bzr mkdir white
@@ -296,11 +295,11 @@
 
 ``bzr resolve`` recognizes the following actions::
 
- * ``--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.
+- ``--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.
 
 Bazaar cannot auto-detect when conflicts of this kind have been resolved.
 
@@ -313,7 +312,7 @@
   Created directory.
 
 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:
+has changed the directory into a file or symlink.  For example::
 
   $ bzr init
   $ bzr mkdir foo
@@ -331,11 +330,11 @@
 
 ``bzr resolve`` recognizes the following actions::
 
- * ``--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.
+- ``--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.
 
 Bazaar cannot auto-detect when conflicts of this kind have been resolved.