On Wed, Apr 14, 2010 at 11:19, <julianf...@apache.org> wrote: >... > +++ subversion/trunk/subversion/libsvn_wc/questions.c Wed Apr 14 15:19:13 2010 > @@ -85,6 +85,11 @@ > * if verify_checksum is TRUE. If checksum does not match, return the error > * SVN_ERR_WC_CORRUPT_TEXT_BASE. > * > + * If COMPARE_TEXTBASES is true, translate VERSIONED_FILE_ABSPATH to > + * repository-normal form and compare the result with PRISTINE_STREAM; if > + * false, translate PRISTINE_STREAM to working-copy form and compare the > + * result with VERSIONED_FILE_ABSPATH.
This sounds like it is doing exactly the same thing, just in different directions. Unless you realize that line endings are *repaired* on the detranslate. Thus, it is comparing contents based on a repo-normal/repaired basis, OR it is comparing an expanded pristine against a potentially-line-ending-inconsistent working file. >... > +++ subversion/trunk/subversion/libsvn_wc/wc.h Wed Apr 14 15:19:13 2010 > @@ -488,7 +488,13 @@ svn_wc__internal_conflicted_p(svn_boolea > > > /* Similar to svn_wc__versioned_file_modcheck(), but with a wc_db parameter > - * instead of a wc_context. */ > + * instead of a wc_context. > + * > + * If COMPARE_TEXTBASES is true, translate VERSIONED_FILE_ABSPATH to > + * repository-normal form and compare the result with BASE_FILE_ABSPATH; if > + * false, translate BASE_FILE_ABSPATH to working-copy form and compare the > + * result with VERSIONED_FILE_ABSPATH. Likewise, of course. Cheers, -g
