← 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: Robert Collins
  • Date: 2007-04-19 02:27:44 UTC
  • mto: This revision was merged to the branch mainline in revision 2426.
  • Revision ID: robertc@robertcollins.net-20070419022744-pfdqz42kp1wizh43
``make docs`` now creates a man page at ``man1/bzr.1`` fixing bug 107388.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
260
260
        tree_b.commit('commit d')
261
261
        out = self.runbzr('pull ../branch_a', retcode=3)
262
262
        self.assertEquals(out,
263
 
                ('','bzr: ERROR: These branches have diverged.  Use the merge command to reconcile them.\n'))
 
263
                ('','bzr: ERROR: These branches have diverged.'
 
264
                    ' Use the merge command to reconcile them.\n'))
264
265
        self.assertEquals(branch_b.get_parent(), parent)
265
266
        # test implicit --remember after resolving previous failure
266
267
        uncommit(branch=branch_b, tree=tree_b)
297
298
        bundle_file.close()
298
299
 
299
300
        os.chdir('../branch_b')
300
 
        output = self.run_bzr('pull', '../bundle')
301
 
        self.assertEqual('', output[0])
302
 
        self.assertEqual(' M  a\nAll changes applied successfully.\n'
303
 
                         '1 revision(s) pulled.\n', output[1])
 
301
        out, err = self.run_bzr('pull', '../bundle')
 
302
        self.assertEqual(out,
 
303
                         'Now on revision 2.\n')
 
304
        self.assertEqual(err,
 
305
                ' M  a\nAll changes applied successfully.\n')
304
306
 
305
307
        self.assertEqualDiff(tree_a.branch.revision_history(),
306
308
                             tree_b.branch.revision_history())
313
315
                             testament_b.as_text())
314
316
 
315
317
        # it is legal to attempt to pull an already-merged bundle
316
 
        output = self.run_bzr('pull', '../bundle')
317
 
        self.assertEqual('', output[0])
318
 
        self.assertEqual('0 revision(s) pulled.\n', output[1])
 
318
        out, err = self.run_bzr('pull', '../bundle')
 
319
        self.assertEqual(err, '')
 
320
        self.assertEqual(out, 'No revisions to pull.\n')