You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by gs...@apache.org on 2010/04/01 22:36:23 UTC
svn commit: r930083 - in /subversion/trunk/subversion:
include/private/svn_wc_private.h libsvn_client/merge.c libsvn_wc/questions.c
Author: gstein
Date: Thu Apr 1 20:36:23 2010
New Revision: 930083
URL: http://svn.apache.org/viewvc?rev=930083&view=rev
Log:
Remove a parameter that was always passed TRUE (from its single callsite).
* subversion/include/private/svn_wc_private.h:
(svn_wc__versioned_file_modcheck): remove COMPARE_TEXTBASES param
* subversion/libsvn_client/merge.c:
(files_same_p): remove COMPARE_TEXTBASES=TRUE param
* subversion/libsvn_wc/questions.c:
(): remove some unused headers
(svn_wc__versioned_file_modcheck): remove COMPARE_TEXTBASES param, and
just pass TRUE to internal_versioned_file_modcheck
Modified:
subversion/trunk/subversion/include/private/svn_wc_private.h
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_wc/questions.c
Modified: subversion/trunk/subversion/include/private/svn_wc_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_wc_private.h?rev=930083&r1=930082&r2=930083&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Thu Apr 1 20:36:23 2010
@@ -122,7 +122,6 @@ svn_wc__versioned_file_modcheck(svn_bool
svn_wc_context_t *wc_ctx,
const char *versioned_file_abspath,
const char *base_file_abspath,
- svn_boolean_t compare_textbases,
apr_pool_t *scratch_pool);
/**
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=930083&r1=930082&r2=930083&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Apr 1 20:36:23 2010
@@ -1839,8 +1839,7 @@ files_same_p(svn_boolean_t *same,
/* Compare the file content, translating 'mine' to 'normal' form. */
SVN_ERR(svn_wc__versioned_file_modcheck(&modified, wc_ctx, mine_abspath,
- older_abspath, TRUE,
- scratch_pool));
+ older_abspath, scratch_pool));
*same = !modified;
}
Modified: subversion/trunk/subversion/libsvn_wc/questions.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/questions.c?rev=930083&r1=930082&r2=930083&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/questions.c (original)
+++ subversion/trunk/subversion/libsvn_wc/questions.c Thu Apr 1 20:36:23 2010
@@ -35,19 +35,15 @@
#include "svn_string.h"
#include "svn_error.h"
#include "svn_dirent_uri.h"
-#include "svn_path.h"
#include "svn_time.h"
#include "svn_io.h"
#include "svn_props.h"
#include "wc.h"
#include "adm_files.h"
-#include "entries.h"
#include "props.h"
#include "translate.h"
#include "wc_db.h"
-#include "lock.h"
-#include "tree_conflicts.h"
#include "svn_private_config.h"
#include "private/svn_wc_private.h"
@@ -247,12 +243,12 @@ svn_wc__versioned_file_modcheck(svn_bool
svn_wc_context_t *wc_ctx,
const char *versioned_file_abspath,
const char *base_file_abspath,
- svn_boolean_t compare_textbases,
apr_pool_t *scratch_pool)
{
return svn_error_return(svn_wc__internal_versioned_file_modcheck(
modified_p, wc_ctx->db, versioned_file_abspath,
- base_file_abspath, compare_textbases,
+ base_file_abspath,
+ TRUE /* compare_textbases */,
scratch_pool));
}