You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/04/14 17:19:14 UTC
svn commit: r933985 - in /subversion/trunk/subversion/libsvn_wc: questions.c
wc.h
Author: julianfoad
Date: Wed Apr 14 15:19:13 2010
New Revision: 933985
URL: http://svn.apache.org/viewvc?rev=933985&view=rev
Log:
Update some doc strings.
* subversion/libsvn_wc/questions.c
(compare_and_verify): Document the 'compare_textbases' parameter.
* subversion/libsvn_wc/wc.h
(svn_wc__internal_versioned_file_modcheck): Document 'compare_textbases'.
Modified:
subversion/trunk/subversion/libsvn_wc/questions.c
subversion/trunk/subversion/libsvn_wc/wc.h
Modified: subversion/trunk/subversion/libsvn_wc/questions.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/questions.c?rev=933985&r1=933984&r2=933985&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/questions.c (original)
+++ 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.
+ *
* PRISTINE_STREAM will be closed before a successful return.
*
* DB is a wc_db; use SCRATCH_POOL for temporary allocation.
Modified: subversion/trunk/subversion/libsvn_wc/wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc.h?rev=933985&r1=933984&r2=933985&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc.h (original)
+++ 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.
+ */
svn_error_t *
svn_wc__internal_versioned_file_modcheck(svn_boolean_t *modified_p,
svn_wc__db_t *db,
Re: svn commit: r933985 - in
/subversion/trunk/subversion/libsvn_wc: questions.c wc.h
Posted by Julian Foad <ju...@wandisco.com>.
On Wed, 2010-04-14 at 12:02 -0400, Greg Stein wrote:
> On Wed, Apr 14, 2010 at 11:19, <ju...@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.
Ah yes. (Potentially line-ending-inconsitent and/or
keyword-values-tinkered-with-or-out-of-date, I presume.)
Docs clarified in r934370.
Thanks.
- Julian
> >...
> > +++ 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
Re: svn commit: r933985 - in /subversion/trunk/subversion/libsvn_wc:
questions.c wc.h
Posted by Greg Stein <gs...@gmail.com>.
On Wed, Apr 14, 2010 at 11:19, <ju...@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