← 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: Martin Pool
  • Date: 2006-06-15 05:36:34 UTC
  • mto: This revision was merged to the branch mainline in revision 1797.
  • Revision ID: mbp@sourcefrog.net-20060615053634-4fd52ba691855659
Clean up many exception classes.

Errors indicating a user error are now shown with is_user_error on the
exception; use this rather than hardcoding a list of exceptions that should be
handled this way.

Exceptions now inherit from BzrNewException where possible to use consistent
formatting method.

Remove rather obsolete docstring test on Branch.missing_revisions.

Remove dead code from find_merge_base.


Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
248
248
        tree_b.commit('commit d')
249
249
        out = self.runbzr('pull ../branch_a', retcode=3)
250
250
        self.assertEquals(out,
251
 
                ('','bzr: ERROR: These branches have diverged.  Try merge.\n'))
 
251
                ('','bzr: ERROR: These branches have diverged.  Use the merge command to reconcile them.\n'))
252
252
        self.assertEquals(abspath(branch_b.get_parent()), abspath(parent))
253
253
        # test implicit --remember after resolving previous failure
254
254
        uncommit(branch=branch_b, tree=tree_b)