← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2008-09-02 05:28:37 UTC
  • mfrom: (3675 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3677.
  • Revision ID: robertc@robertcollins.net-20080902052837-ec3qlv41q5e7f6fl
Resolve conflicts with NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_push.py
87
87
        out, err = self.run_bzr('push')
88
88
        path = branch_a.get_push_location()
89
89
        self.assertEquals(out,
90
 
                          'Using saved location: %s\n' 
 
90
                          'Using saved push location: %s\n' 
91
91
                          'Pushed up to revision 2.\n'
92
92
                          % local_path_from_url(path))
93
93
        self.assertEqual(err,