Merge lp:~nmb/bzr/fix-213184 into lp:bzr

[Neil Martinsen-Burrell]

[Neil Martinsen-Burrell (nmb)]

This adds documentation about fixing tag conflicts to bzr help conflicts. It should take a step towards fixing 213184. I did not add a mention of this to ``bzr pull`` since I think that ``bzr help conflicts`` is a reasonable response to "Conflicting tags", but I could add that if desired.

[Robert Collins (lifeless)]

Looks good. Perhaps it should say 'apply the tag you want to win to one of the branches - either the source or target.'. Also, pull --overwrite will overwrite all tags, I think.

review: Approve

[Neil Martinsen-Burrell (nmb)]

Updated in that branch.

[John A Meinel (jameinel)]

review: Approve

=== modified file 'bzrlib/conflicts.py'
--- bzrlib/conflicts.py	2009-03-23 14:59:43 +0000
+++ bzrlib/conflicts.py	2009-11-25 16:45:24 +0000
@@ -53,13 +53,12 @@
     instead.  (This is useful for editing all files with text conflicts.)
 
     Use bzr resolve when you have fixed a problem.
-
-    See also bzr resolve.
     """
     takes_options = [
             Option('text',
                    help='List paths of files with text conflicts.'),
         ]
+    _see_also = ['resolve']
 
     def run(self, text=False):
         from bzrlib.workingtree import WorkingTree
@@ -82,16 +81,15 @@
     before you should commit.
 
     Once you have fixed a problem, use "bzr resolve" to automatically mark
-    text conflicts as fixed, resolve FILE to mark a specific conflict as
+    text conflicts as fixed, "bzr resolve FILE" to mark a specific conflict as
     resolved, or "bzr resolve --all" to mark all conflicts as resolved.
-
-    See also bzr conflicts.
     """
     aliases = ['resolved']
     takes_args = ['file*']
     takes_options = [
             Option('all', help='Resolve all conflicts in this tree.'),
             ]
+    _see_also = ['conflicts']
     def run(self, file_list=None, all=False):
         from bzrlib.workingtree import WorkingTree
         if all:

=== modified file 'bzrlib/help_topics/en/conflicts.txt'
--- bzrlib/help_topics/en/conflicts.txt	2007-12-25 04:17:50 +0000
+++ bzrlib/help_topics/en/conflicts.txt	2009-11-25 16:45:24 +0000
@@ -79,6 +79,29 @@
 FILE".  Bazaar cannot auto-detect when conflicts of this kind have been
 resolved.
 
+Tag conflicts
+-------------
+
+Typical message::
+
+  Conflicting tags:
+      version-0.1
+
+When pulling from or pushing to another branch, Bazaar informs you about tags
+that conflict between the two branches; that is the same tag points to two
+different revisions.  You need not resolve these conflicts, but subsequent
+uses of pull or push will result in the same message.
+
+To resolve the conflict, you must apply the correct tags to either the target
+branch or the source branch as appropriate.  Use "bzr tags --show-ids -d
+SOURCE_URL" to see the tags in the source branch.  If you want to make the
+target branch's tags match the source branch, then in the target branch do 
+``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the
+CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the source
+branch.  You need not call "bzr resolve" after doing this.  To resolve in favor of the target branch, you need to similarly use ``tag --force`` in the source
+branch.  (Note that pulling or pushing using --overwrite will overwrite all
+tags as well.)
+
 Duplicate paths
 ---------------