[MERGE] [0.90] Disable patch verification (broken for CRLF files)

[Alexander Belchenko]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Aaron Bentley пишет:
> Aaron Bentley wrote:
>> Aaron Bentley wrote:
> 
>>> We recently discovered that patch verification is broken for CRLF files
>>> (and probably CR files, too).  The fix appeared simple, but I've run
>>> into problems testing it, so I think the safest things it to disable it
>>> for now.  I'll get a fix in before 0.91.
>>> I think it is important to get some kind of fix into 0.90, because it
>>> will be an extremely visible bug for projects using non-LF source files
>>> and bundles/merge-directives.
> 
> Can someone please review this?

I try to follow your patch, but I can't.
You're using 'verified', 'inapplicable' and 'failed'.
But I don't see where they used outside of test suite.
I found only on place in builtins.py:

in cmd_merge:

            if allow_pending:
                merger.set_pending()
            if verified == 'failed':
                warning('Preview patch does not match changes')
            if conflict_count != 0:
                return 1
            else:
                return 0

That's all. Is my grepping correct?

- --
[µ]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGwM3LzYr338mxwCURAt1gAJ4nTIb4Qxr8BDyPr4j5KHblVEbzfgCgj6Fs
rGEkOAaHM4ZivDnNC/z2Zgw=
=LDJ5
-----END PGP SIGNATURE-----