Rev 2553: (Adeodato Simó) fix bug #120591 by using exact encoding for merge directives. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2553
revision-id: pqm at pqm.ubuntu.com-20070626191000-flte155pupv54bcs
parent: pqm at pqm.ubuntu.com-20070626061722-8m49gdqd8cb8zc0c
parent: john at arbash-meinel.com-20070626141056-zr6wslndfw8tkg5d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-26 20:10:00 +0100
message:
  (Adeodato Simó) fix bug #120591 by using exact encoding for merge directives.
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
    ------------------------------------------------------------
    revno: 2552.1.1
    merged: john at arbash-meinel.com-20070626141056-zr6wslndfw8tkg5d
    parent: pqm at pqm.ubuntu.com-20070626061722-8m49gdqd8cb8zc0c
    parent: dato at net.com.org.es-20070617161104-8mqczaz3oobfg0xy
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Tue 2007-06-26 09:10:56 -0500
    message:
      (Adeodato Simó) fix bug #120591 by using exact encoding for merge directives.
    ------------------------------------------------------------
    revno: 2530.2.1
    merged: dato at net.com.org.es-20070617161104-8mqczaz3oobfg0xy
    parent: pqm at pqm.ubuntu.com-20070615082222-98j9j9nbl6p2dx0m
    committer: Adeodato Simó <dato at net.com.org.es>
    branch nick: bzr.merge_directive_exact_encoding
    timestamp: Sun 2007-06-17 17:11:04 +0100
    message:
      Add encoding_type = 'exact' to cmd_merge_directive. (LP #120591)
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2007-06-25 17:46:47 +0000
+++ b/bzrlib/builtins.py	2007-06-26 14:10:56 +0000
@@ -3536,6 +3536,8 @@
             help='Message to use when committing this merge')
         ]
 
+    encoding_type = 'exact'
+
     def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
             sign=False, revision=None, mail_to=None, message=None):
         from bzrlib.revision import ensure_null, NULL_REVISION

=== modified file 'bzrlib/tests/blackbox/test_merge_directive.py'
--- a/bzrlib/tests/blackbox/test_merge_directive.py	2007-06-25 13:17:32 +0000
+++ b/bzrlib/tests/blackbox/test_merge_directive.py	2007-06-26 14:10:56 +0000
@@ -232,3 +232,8 @@
         os.chdir('foo')
         self.run_bzr_error(('No revisions to bundle.', ),
                             'merge-directive', '../bar')
+
+    def test_encoding_exact(self):
+        tree1, tree2 = self.prepare_merge_directive()
+        tree1.commit(u'messag\xe9')
+        self.run_bzr('merge-directive', '../tree2') # no exception raised