Rev 4329: (Samuel Bronson) Suggest 'bzr missing' in DivergedBranches. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4329
revision-id: pqm at pqm.ubuntu.com-20090505124104-hdr2see3289mg7dn
parent: pqm at pqm.ubuntu.com-20090505113242-g9477bsuoaswvvje
parent: jelmer at samba.org-20090505114047-nd8quygr8z6hmpfy
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-05-05 13:41:04 +0100
message:
  (Samuel Bronson) Suggest 'bzr missing' in DivergedBranches.
modified:
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
    ------------------------------------------------------------
    revno: 4297.3.3
    revision-id: jelmer at samba.org-20090505114047-nd8quygr8z6hmpfy
    parent: jelmer at samba.org-20090505103527-fcj8douevkfc7znx
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: missing
    timestamp: Tue 2009-05-05 13:40:47 +0200
    message:
      Fix pull --remember test.
    modified:
      bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
    ------------------------------------------------------------
    revno: 4297.3.2
    revision-id: jelmer at samba.org-20090505103527-fcj8douevkfc7znx
    parent: naesten at gmail.com-20090417145715-sl6z3zo87w5nvngt
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: missing
    timestamp: Tue 2009-05-05 12:35:27 +0200
    message:
      Remove extra space.
    modified:
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
    ------------------------------------------------------------
    revno: 4297.3.1
    revision-id: naesten at gmail.com-20090417145715-sl6z3zo87w5nvngt
    parent: pqm at pqm.ubuntu.com-20090417084143-8ias85nrnap1hk9z
    committer: Samuel Bronson <naesten at gmail.com>
    branch nick: dev
    timestamp: Fri 2009-04-17 10:57:15 -0400
    message:
      Add suggestion to use "missing" to message for DivergedBranches.
    modified:
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py	2009-05-01 06:42:30 +0000
+++ b/bzrlib/errors.py	2009-05-05 12:41:04 +0000
@@ -1173,7 +1173,8 @@
 class DivergedBranches(BzrError):
 
     _fmt = ("These branches have diverged."
-            " Use the merge command to reconcile them.")
+            " Use the missing command to see how.\n"
+            "Use the merge command to reconcile them.")
 
     def __init__(self, branch1, branch2):
         self.branch1 = branch1

=== modified file 'bzrlib/tests/blackbox/test_pull.py'
--- a/bzrlib/tests/blackbox/test_pull.py	2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/blackbox/test_pull.py	2009-05-05 11:40:47 +0000
@@ -239,7 +239,8 @@
         out = self.run_bzr('pull ../branch_a', retcode=3)
         self.assertEqual(out,
                 ('','bzr: ERROR: These branches have diverged.'
-                    ' Use the merge command to reconcile them.\n'))
+                    ' Use the missing command to see how.\n'
+                    'Use the merge command to reconcile them.\n'))
         self.assertEqual(branch_b.get_parent(), parent)
         # test implicit --remember after resolving previous failure
         uncommit(branch=branch_b, tree=tree_b)