Rev 3342: (mbp) criss-cross help: suggest revert/merge in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3342
revision-id:pqm at pqm.ubuntu.com-20080407061951-fgvwd4v010ibwl3u
parent: pqm at pqm.ubuntu.com-20080407044456-s1a9orh0kssphdh9
parent: mbp at sourcefrog.net-20080402041623-28i8ksft8v7r6wlo
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-04-07 07:19:51 +0100
message:
  (mbp) criss-cross help: suggest revert/merge
modified:
  bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
    ------------------------------------------------------------
    revno: 3324.3.2
    revision-id:mbp at sourcefrog.net-20080402041623-28i8ksft8v7r6wlo
    parent: mbp at sourcefrog.net-20080402012740-3lp0mqogwj15uwjs
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: doc
    timestamp: Wed 2008-04-02 15:16:23 +1100
    message:
      criss-cross help: suggest revert/merge
    modified:
      bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
    ------------------------------------------------------------
    revno: 3324.3.1
    revision-id:mbp at sourcefrog.net-20080402012740-3lp0mqogwj15uwjs
    parent: pqm at pqm.ubuntu.com-20080401091848-6y4f104r061ad8bk
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: trivial
    timestamp: Wed 2008-04-02 11:27:40 +1000
    message:
      help criss-cross should suggest using remerge
    modified:
      bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
=== modified file 'bzrlib/help_topics/__init__.py'
--- a/bzrlib/help_topics/__init__.py	2008-03-29 12:57:21 +0000
+++ b/bzrlib/help_topics/__init__.py	2008-04-02 04:16:23 +0000
@@ -580,8 +580,9 @@
 A criss-cross in the branch history can cause the default merge technique
 to emit more conflicts than would normally be expected.
 
-If you encounter criss-crosses, you can use merge --weave instead, which
-should provide a much better result.
+In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may give
+better results.  You may wish to ``bzr revert`` the working tree and merge
+again.  Alternatively, use ``bzr remerge`` on particular conflicted files.
 
 Criss-crosses occur in a branch's history if two branches merge the same thing
 and then merge one another, or if two branches merge one another at the same
@@ -601,7 +602,8 @@
 
 The ``weave`` merge type is not affected by this problem because it uses
 line-origin detection instead of a basis revision to determine the cause of
-differences."""
+differences.
+"""
 
 
 # Register help topics