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 2013/01/28 18:47:31 UTC
svn commit: r1439523 - in /subversion/trunk/subversion/libsvn_wc:
adm_crawler.c conflicts.c conflicts.h
Author: julianfoad
Date: Mon Jan 28 17:47:31 2013
New Revision: 1439523
URL: http://svn.apache.org/viewvc?rev=1439523&view=rev
Log:
* subversion/libsvn_wc/conflicts.h,
subversion/libsvn_wc/conflicts.c
(svn_wc__resolve_text_conflict): Rename to 'mark_resolved_text_conflict'
for clarity, since we have a bunch of other functions that actually
resolve conflicts and this is not one of them.
* subversion/libsvn_wc/adm_crawler.c
(restore_file): Update caller, and rename the 'resolve_text_conflict'
parameter to 'mark_resolved_text_conflict' similarly.
(svn_wc_restore, restore_node): Annotate the calls to restore_file().
Modified:
subversion/trunk/subversion/libsvn_wc/adm_crawler.c
subversion/trunk/subversion/libsvn_wc/conflicts.c
subversion/trunk/subversion/libsvn_wc/conflicts.h
Modified: subversion/trunk/subversion/libsvn_wc/adm_crawler.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_crawler.c?rev=1439523&r1=1439522&r2=1439523&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_crawler.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_crawler.c Mon Jan 28 17:47:31 2013
@@ -58,8 +58,8 @@
last-commit-time. Either way, set entry-timestamp to match that of
the working file when all is finished.
- If REMOVE_TEXT_CONFLICT is TRUE, remove an existing text conflict
- from LOCAL_ABSPATH.
+ If MARK_RESOLVED_TEXT_CONFLICT is TRUE, mark as resolved any existing
+ text conflict on LOCAL_ABSPATH.
Not that a valid access baton with a write lock to the directory of
LOCAL_ABSPATH must be available in DB.*/
@@ -67,7 +67,7 @@ static svn_error_t *
restore_file(svn_wc__db_t *db,
const char *local_abspath,
svn_boolean_t use_commit_times,
- svn_boolean_t remove_text_conflicts,
+ svn_boolean_t mark_resolved_text_conflict,
apr_pool_t *scratch_pool)
{
svn_skel_t *work_item;
@@ -89,8 +89,8 @@ restore_file(svn_wc__db_t *db,
scratch_pool));
/* Remove any text conflict */
- if (remove_text_conflicts)
- SVN_ERR(svn_wc__resolve_text_conflict(db, local_abspath, scratch_pool));
+ if (mark_resolved_text_conflict)
+ SVN_ERR(svn_wc__mark_resolved_text_conflict(db, local_abspath, scratch_pool));
return SVN_NO_ERROR;
}
@@ -135,7 +135,8 @@ svn_wc_restore(svn_wc_context_t *wc_ctx,
}
if (kind == svn_kind_file || kind == svn_kind_symlink)
- SVN_ERR(restore_file(wc_ctx->db, local_abspath, use_commit_times, FALSE,
+ SVN_ERR(restore_file(wc_ctx->db, local_abspath, use_commit_times,
+ FALSE /*mark_resolved_text_conflict*/,
scratch_pool));
else
SVN_ERR(svn_io_dir_make(local_abspath, APR_OS_DEFAULT, scratch_pool));
@@ -161,8 +162,9 @@ restore_node(svn_wc__db_t *db,
{
if (kind == svn_kind_file || kind == svn_kind_symlink)
{
- /* Recreate file from text-base */
- SVN_ERR(restore_file(db, local_abspath, use_commit_times, TRUE,
+ /* Recreate file from text-base; mark any text conflict as resolved */
+ SVN_ERR(restore_file(db, local_abspath, use_commit_times,
+ TRUE /*mark_resolved_text_conflict*/,
scratch_pool));
}
else if (kind == svn_kind_dir)
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1439523&r1=1439522&r2=1439523&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Mon Jan 28 17:47:31 2013
@@ -2566,9 +2566,9 @@ resolve_conflict_on_node(svn_boolean_t *
svn_error_t *
-svn_wc__resolve_text_conflict(svn_wc__db_t *db,
- const char *local_abspath,
- apr_pool_t *scratch_pool)
+svn_wc__mark_resolved_text_conflict(svn_wc__db_t *db,
+ const char *local_abspath,
+ apr_pool_t *scratch_pool)
{
svn_boolean_t ignored_result;
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.h?rev=1439523&r1=1439522&r2=1439523&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.h (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.h Mon Jan 28 17:47:31 2013
@@ -401,11 +401,11 @@ svn_wc__conflict_invoke_resolver(svn_wc_
apr_pool_t *scratch_pool);
-/* Resolve text conflicts on the given node. */
+/* Mark as resolved any text conflict on the node at DB/LOCAL_ABSPATH. */
svn_error_t *
-svn_wc__resolve_text_conflict(svn_wc__db_t *db,
- const char *local_abspath,
- apr_pool_t *scratch_pool);
+svn_wc__mark_resolved_text_conflict(svn_wc__db_t *db,
+ const char *local_abspath,
+ apr_pool_t *scratch_pool);
#ifdef __cplusplus
}