You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/04/09 14:35:18 UTC
svn commit: r932386 - /subversion/trunk/subversion/libsvn_client/merge.c
Author: philip
Date: Fri Apr 9 12:35:18 2010
New Revision: 932386
URL: http://svn.apache.org/viewvc?rev=932386&view=rev
Log:
* subversion/libsvn_client/merge.c
(svn_client_merge3, svn_client_merge_reintegrate, svn_client_merge_peg3):
Only take a write lock if not a dry-run.
Suggested by: gstein
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=932386&r1=932385&r2=932386&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Apr 9 12:35:18 2010
@@ -8604,8 +8604,11 @@ svn_client_merge3(const char *source1,
baton.merge_options = merge_options;
baton.ctx = ctx;
- SVN_ERR(svn_wc__call_with_write_lock(merge_cb, &baton, ctx->wc_ctx,
- lock_abspath, pool, pool));
+ if (!dry_run)
+ SVN_ERR(svn_wc__call_with_write_lock(merge_cb, &baton, ctx->wc_ctx,
+ lock_abspath, pool, pool));
+ else
+ SVN_ERR(merge_cb(&baton, pool, pool));
return SVN_NO_ERROR;
}
@@ -9753,8 +9756,13 @@ svn_client_merge_reintegrate(const char
baton.merge_options = merge_options;
baton.ctx = ctx;
- SVN_ERR(svn_wc__call_with_write_lock(merge_reintegrate_cb, &baton,
- ctx->wc_ctx, lock_abspath, pool, pool));
+ if (!dry_run)
+ SVN_ERR(svn_wc__call_with_write_lock(merge_reintegrate_cb, &baton,
+ ctx->wc_ctx, lock_abspath,
+ pool, pool));
+ else
+ SVN_ERR(merge_reintegrate_cb(&baton, pool, pool));
+
return SVN_NO_ERROR;
}
@@ -9908,8 +9916,11 @@ svn_client_merge_peg3(const char *source
baton.merge_options = merge_options;
baton.ctx = ctx;
- SVN_ERR(svn_wc__call_with_write_lock(merge_peg_cb, &baton, ctx->wc_ctx,
- lock_abspath, pool, pool));
+ if (!dry_run)
+ SVN_ERR(svn_wc__call_with_write_lock(merge_peg_cb, &baton, ctx->wc_ctx,
+ lock_abspath, pool, pool));
+ else
+ SVN_ERR(merge_peg_cb(&baton, pool, pool));
return SVN_NO_ERROR;
}