Rev 2697: Disable patch verification (broken for CRLF files) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 2697
revision-id: pqm at pqm.ubuntu.com-20070813221757-bianevqddds8ift5
parent: pqm at pqm.ubuntu.com-20070813122444-5pi8f4fwxqpgxs1x
parent: abentley at panoramicfeedback.com-20070813124850-zadf6jl35irjkxag
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-08-13 23:17:57 +0100
message:
  Disable patch verification (broken for CRLF files)
modified:
  bzrlib/merge_directive.py      merge_directive.py-20070228184838-ja62280spt1g7f4x-1
  bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
  bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
    ------------------------------------------------------------
    revno: 2694.1.2.1.1
    merged: abentley at panoramicfeedback.com-20070813124850-zadf6jl35irjkxag
    parent: abentley at panoramicfeedback.com-20070810203616-ddqcdj4bzxh7db7r
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: old-merge-directive
    timestamp: Mon 2007-08-13 08:48:50 -0400
    message:
      Disable patch verification (broken for CRLF files)
=== modified file 'bzrlib/merge_directive.py'
--- a/bzrlib/merge_directive.py	2007-08-10 22:19:18 +0000
+++ b/bzrlib/merge_directive.py	2007-08-13 22:17:57 +0000
@@ -504,6 +504,8 @@
             if self._verify_patch(repository):
                 return 'verified'
             else:
+                #FIXME patch verification is broken for CRLF files
+                return 'inapplicable'
                 return 'failed'
         else:
             return 'inapplicable'

=== modified file 'bzrlib/tests/blackbox/test_merge.py'
--- a/bzrlib/tests/blackbox/test_merge.py	2007-08-01 08:38:24 +0000
+++ b/bzrlib/tests/blackbox/test_merge.py	2007-08-13 12:48:50 +0000
@@ -334,7 +334,9 @@
         self.write_directive('directive', source.branch, 'target', 'rev1',
                              mangle_patch=True)
         err = self.run_bzr('merge -d target directive')[1]
-        self.assertContainsRe(err, 'Preview patch does not match changes')
+        self.expectFailure('Patch verification is disabled',
+                           self.assertContainsRe, err,
+                           'Preview patch does not match changes')
 
     def test_merge_arbitrary(self):
         target = self.make_branch_and_tree('target')

=== modified file 'bzrlib/tests/test_merge_directive.py'
--- a/bzrlib/tests/test_merge_directive.py	2007-08-10 20:36:16 +0000
+++ b/bzrlib/tests/test_merge_directive.py	2007-08-13 12:48:50 +0000
@@ -528,7 +528,8 @@
             self.assertEqual('inapplicable', verified)
         else:
             self.assertEqual('rev1', base)
-            self.assertEqual('failed', verified)
+            self.expectFailure('Patch verification is disabled',
+                               self.assertEqual, 'failed', verified)
 
     def test_install_revisions_bundle(self):
         tree_a, tree_b, branch_c = self.make_trees()