← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2009-05-28 16:14:16 UTC
  • mfrom: (4387 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4389.
  • Revision ID: jelmer@samba.org-20090528161416-k7x0l8hwuk2kyvsf
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_dpush.py
71
71
        source_tree = self.make_branch_and_tree("dc")
72
72
        output, error = self.run_bzr("dpush -d dc dp", retcode=3)
73
73
        self.assertEquals("", output)
74
 
        self.assertContainsRe(error, 'not a foreign branch, use regular push')
 
74
        self.assertContainsRe(error, 'in the same VCS, lossy push not necessary. Please use regular push.')
75
75
 
76
76
    def test_dpush(self):
77
77
        branch = self.make_dummy_builder('d').get_branch()
80
80
        self.build_tree(("dc/foo", "blaaaa"))
81
81
        dc.open_workingtree().commit('msg')
82
82
 
83
 
        self.check_output("", "dpush -d dc d")
 
83
        output, error = self.run_bzr("dpush -d dc d")
 
84
        self.assertEquals(error, "Pushed up to revision 2.\n")
84
85
        self.check_output("", "status dc")
85
86
 
86
87
    def test_dpush_new(self):