You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2011/05/24 20:27:42 UTC
svn commit: r1127198 - in /subversion/trunk/subversion: include/svn_client.h
include/svn_error_codes.h libsvn_client/merge.c
Author: cmpilato
Date: Tue May 24 18:27:41 2011
New Revision: 1127198
URL: http://svn.apache.org/viewvc?rev=1127198&view=rev
Log:
Followup to r1124382, fixing concerns raised by danielsh and
rhuijben.
* subversion/include/svn_error_codes.h
(SVN_ERR_CLIENT_MERGE_UPDATE_REQUIRED): Was
SVN_ERR_CLIENT_MERGE_UPDATEREQUIRED.
* subversion/include/svn_client.h
(svn_client_merge4): Correct the listed error code returned in
mixed-rev working copy situations.
* subversion/libsvn_client/merge.c
(calculate_remaining_ranges, ensure_wc_is_suitable_merge_target):
Track renamed error code.
Modified:
subversion/trunk/subversion/include/svn_client.h
subversion/trunk/subversion/include/svn_error_codes.h
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1127198&r1=1127197&r2=1127198&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Tue May 24 18:27:41 2011
@@ -3174,7 +3174,7 @@ svn_client_diff_summarize_peg(const char
* feedback is provided, but the working copy is not modified.
*
* If allow_mixed_rev is @c FALSE, and @a merge_target is a mixed-revision
- * working copy, raise @c SVN_ERR_CLIENT_NOT_READY_TO_MERGE.
+ * working copy, raise @c SVN_ERR_CLIENT_MERGE_UPDATE_REQUIRED.
* Because users rarely intend to merge into mixed-revision working copies,
* it is recommended to set this parameter to FALSE by default unless the
* user has explicitly requested a merge into a mixed-revision working copy.
Modified: subversion/trunk/subversion/include/svn_error_codes.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_error_codes.h?rev=1127198&r1=1127197&r2=1127198&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_error_codes.h (original)
+++ subversion/trunk/subversion/include/svn_error_codes.h Tue May 24 18:27:41 2011
@@ -1197,7 +1197,7 @@ SVN_ERROR_START
"Detected a cycle while processing the operation")
/** @since New in 1.7. */
- SVN_ERRDEF(SVN_ERR_CLIENT_MERGE_UPDATEREQUIRED,
+ SVN_ERRDEF(SVN_ERR_CLIENT_MERGE_UPDATE_REQUIRED,
SVN_ERR_CLIENT_CATEGORY_START + 20,
"Working copy and merge source not ready for reintegration")
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1127198&r1=1127197&r2=1127198&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue May 24 18:27:41 2011
@@ -3943,7 +3943,7 @@ calculate_remaining_ranges(svn_client__m
SVN_ERR(svn_wc__node_get_url(&url, ctx->wc_ctx, child->abspath,
scratch_pool, scratch_pool));
if (strcmp(start_url, url) == 0)
- return svn_error_create(SVN_ERR_CLIENT_MERGE_UPDATEREQUIRED, NULL,
+ return svn_error_create(SVN_ERR_CLIENT_MERGE_UPDATE_REQUIRED, NULL,
_("Cannot reverse-merge a range from a "
"path's own future history; try "
"updating first"));
@@ -9017,7 +9017,7 @@ ensure_wc_is_suitable_merge_target(const
}
if (min_rev != max_rev)
- return svn_error_createf(SVN_ERR_CLIENT_MERGE_UPDATEREQUIRED, NULL,
+ return svn_error_createf(SVN_ERR_CLIENT_MERGE_UPDATE_REQUIRED, NULL,
_("Cannot merge into mixed-revision working "
"copy [%lu:%lu]; try updating first"),
min_rev, max_rev);