← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-06-26 19:10:00 UTC
  • mfrom: (2552.1.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070626191000-flte155pupv54bcs
(Adeodato Simó) fix bug #120591 by using exact encoding for merge directives.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge_directive.py
232
232
        os.chdir('foo')
233
233
        self.run_bzr_error(('No revisions to bundle.', ),
234
234
                            'merge-directive', '../bar')
 
235
 
 
236
    def test_encoding_exact(self):
 
237
        tree1, tree2 = self.prepare_merge_directive()
 
238
        tree1.commit(u'messag\xe9')
 
239
        self.run_bzr('merge-directive', '../tree2') # no exception raised