← 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: 2007-02-23 05:39:35 UTC
  • mto: (2220.2.35 tags)
  • mto: This revision was merged to the branch mainline in revision 2309.
  • Revision ID: mbp@sourcefrog.net-20070223053935-r601f8e1xwwljm21
Pull now returns a PullResult rather than just an integer.

Remove old Branch.is_control_file function.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
300
300
        output = self.run_bzr('pull', '../bundle')
301
301
        self.assertEqual('', output[0])
302
302
        self.assertEqual(' M  a\nAll changes applied successfully.\n'
303
 
                         '1 revision(s) pulled.\n', output[1])
 
303
                         'Now on revision 2.\n',
 
304
                         output[1])
304
305
 
305
306
        self.assertEqualDiff(tree_a.branch.revision_history(),
306
307
                             tree_b.branch.revision_history())
315
316
        # it is legal to attempt to pull an already-merged bundle
316
317
        output = self.run_bzr('pull', '../bundle')
317
318
        self.assertEqual('', output[0])
318
 
        self.assertEqual('0 revision(s) pulled.\n', output[1])
 
319
        self.assertEqual('No revisions to pull.\n', output[1])