/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_merge_directive.py

  • Committer: Vincent Ladeuil
  • Date: 2007-06-20 14:25:06 UTC
  • mfrom: (2540 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070620142506-txsb1v8538kpsafw
merge bzr.dev @ 2540

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge_directive.py
213
213
                                  '.')
214
214
        call = connect_calls[0]
215
215
        self.assertEqual(('bogushost', 0), call[1:3])
 
216
 
 
217
    def test_no_common_ancestor(self):
 
218
        foo = self.make_branch_and_tree('foo')
 
219
        foo.commit('rev1')
 
220
        bar = self.make_branch_and_tree('bar')
 
221
        os.chdir('foo')
 
222
        self.run_bzr('merge-directive', '../bar')
 
223
 
 
224
    def test_no_commits(self):
 
225
        foo = self.make_branch_and_tree('foo')
 
226
        bar = self.make_branch_and_tree('bar')
 
227
        os.chdir('foo')
 
228
        self.run_bzr_error(('No revisions to bundle.', ),
 
229
                            'merge-directive', '../bar')