You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/06/19 20:32:51 UTC
svn commit: r1351797 - /subversion/trunk/subversion/libsvn_client/merge.c
Author: stsp
Date: Tue Jun 19 18:32:51 2012
New Revision: 1351797
URL: http://svn.apache.org/viewvc?rev=1351797&view=rev
Log:
Follow-up to r1351792:
* subversion/libsvn_client/merge.c
(merge_locked, merge_peg_locked,
do_symmetric_merge_locked): Say "post-merge", not "post-update", in comments.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1351797&r1=1351796&r2=1351797&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Jun 19 18:32:51 2012
@@ -9545,7 +9545,7 @@ merge_locked(const char *source1,
svn_client__pathrev_t *yca = NULL;
apr_pool_t *sesspool;
svn_boolean_t same_repos;
- /* Resolve conflicts post-update for 1.7 and above API users. */
+ /* Resolve conflicts post-merge for 1.7 and above API users. */
svn_boolean_t resolve_conflicts_post_merge = (ctx->conflict_func2 != NULL);
svn_wc_conflict_resolver_func2_t conflict_func2;
void *conflict_baton2;
@@ -10972,7 +10972,7 @@ merge_peg_locked(const char *source_path
svn_boolean_t use_sleep = FALSE;
svn_error_t *err;
svn_boolean_t same_repos;
- /* Resolve conflicts post-update for 1.7 and above API users. */
+ /* Resolve conflicts post-merge for 1.7 and above API users. */
svn_boolean_t resolve_conflicts_post_merge = (ctx->conflict_func2 != NULL);
svn_wc_conflict_resolver_func2_t conflict_func2;
void *conflict_baton2;
@@ -11631,7 +11631,7 @@ do_symmetric_merge_locked(const svn_clie
merge_target_t *target;
svn_boolean_t use_sleep = FALSE;
svn_error_t *err;
- /* Resolve conflicts post-update for 1.7 and above API users. */
+ /* Resolve conflicts post-merge for 1.7 and above API users. */
svn_boolean_t resolve_conflicts_post_merge = (ctx->conflict_func2 != NULL);
svn_wc_conflict_resolver_func2_t conflict_func2;
void *conflict_baton2;