Author: rhuijben
Date: Mon Apr 18 20:41:33 2011
New Revision: 1094735
URL: http://svn.apache.org/viewvc?rev=1094735&view=rev
Log:
* subversion/libsvn_wc/questions.c
(compare_and_verify): Disable the extra check I added in r1094733. Our
testsuite thinks its ok, but I don't trust this enough yet.
Modified:
subversion/trunk/subversion/libsvn_wc/questions.c
Modified: subversion/trunk/subversion/libsvn_wc/questions.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/questions.c?rev=1094735&r1=1094734&r2=1094735&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/questions.c (original)
+++ subversion/trunk/subversion/libsvn_wc/questions.c Mon Apr 18 20:41:33 2011
@@ -156,6 +156,10 @@ compare_and_verify(svn_boolean_t *modifi
return svn_error_return(svn_stream_close(pristine_stream));
}
+#if 0
+ /* ### On second thought, I think this needs more review before enabling
+ ### This case might break when we have a fixed "\r\n" EOL, because
+ ### we use a repair mode in the compare itself. */
if (need_translation
&& !special
&& !props_mod
@@ -170,6 +174,7 @@ compare_and_verify(svn_boolean_t *modifi
/* ### Why did we open the pristine? */
return svn_error_return(svn_stream_close(pristine_stream));
}
+#endif
/* ### Other checks possible? */
