← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Matthieu Moy
  • Date: 2006-09-11 08:33:10 UTC
  • mto: (1998.1.1 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1999.
  • Revision ID: Matthieu.Moy@imag.fr-20060911083310-6fb1c822a556e34b
Better testcase for revno:N:branch/path error.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
81
81
        self.failUnless(a.branch.repository.has_revision(b_tip))
82
82
        self.assertEqual([a_tip, b_tip], a.get_parent_ids())
83
83
        self.runbzr('revert --no-backup')
84
 
        self.runbzr('merge -r revno:1:./hello', retcode=3)
 
84
        out, err = self.runbzr('merge -r revno:1:./hello', retcode=3)
 
85
        self.assertTrue("Not a branch" in err)
85
86
        self.runbzr('merge -r revno:%d:./..revno:%d:../b'
86
87
                    %(ancestor,b.revno()))
87
88
        self.assertEquals(a.pending_merges(), [b.last_revision()])