~bzr/bzr/bzr.1.5

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2006-10-11 00:23:23 UTC
  • mfrom: (2070 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2071.
  • Revision ID: john@arbash-meinel.com-20061011002323-82ba88c293d7caff
[merge] bzr.dev 2070

Show diffs side-by-side

added added

removed removed

Lines of Context:
71
71
        out = self.run_bzr('push', '../branch_b', retcode=3)
72
72
        self.assertEquals(out,
73
73
                ('','bzr: ERROR: These branches have diverged.  '
74
 
                    'Try a merge then push with overwrite.\n'))
 
74
                    'Try using "merge" and then "push".\n'))
75
75
        self.assertEquals(abspath(branch_a.get_push_location()),
76
76
                          abspath(branch_b.bzrdir.root_transport.base))
77
77