← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_pull.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-05-05 12:41:04 UTC
  • mfrom: (4297.3.3 missing)
  • Revision ID: pqm@pqm.ubuntu.com-20090505124104-hdr2see3289mg7dn
(Samuel Bronson) Suggest 'bzr missing' in DivergedBranches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
239
239
        out = self.run_bzr('pull ../branch_a', retcode=3)
240
240
        self.assertEqual(out,
241
241
                ('','bzr: ERROR: These branches have diverged.'
242
 
                    ' Use the merge command to reconcile them.\n'))
 
242
                    ' Use the missing command to see how.\n'
 
243
                    'Use the merge command to reconcile them.\n'))
243
244
        self.assertEqual(branch_b.get_parent(), parent)
244
245
        # test implicit --remember after resolving previous failure
245
246
        uncommit(branch=branch_b, tree=tree_b)