/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2007-04-23 02:29:35 UTC
  • mfrom: (2441 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2442.
  • Revision ID: robertc@robertcollins.net-20070423022935-9hhongamvk6bfdso
Resolve conflicts with bzr.dev.

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)