You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2011/07/29 10:13:50 UTC
svn commit: r1152140 - /subversion/trunk/subversion/libsvn_client/merge.c
Author: rhuijben
Date: Fri Jul 29 08:13:49 2011
New Revision: 1152140
URL: http://svn.apache.org/viewvc?rev=1152140&view=rev
Log:
* subversion/libsvn_client/merge.c
(merge_reintegrate_locked): Open the source ra session with the function that
can translate revisions instead of trying to convert a revision based on
the possibly unrelated current directory after opening the ra session.
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=1152140&r1=1152139&r2=1152140&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Jul 29 08:13:49 2011
@@ -10572,6 +10572,7 @@ merge_reintegrate_locked(const char *sou
const char *target_url;
svn_revnum_t target_base_rev;
svn_node_kind_t kind;
+ svn_opt_revision_t no_rev;
/* Make sure the target is really there. */
SVN_ERR(svn_io_check_path(target_abspath, &kind, scratch_pool));
@@ -10643,20 +10644,16 @@ merge_reintegrate_locked(const char *sou
NULL, ctx, scratch_pool, scratch_pool));
/* Open two RA sessions, one to our source and one to our target. */
+ no_rev.kind = svn_opt_revision_unspecified;
+ SVN_ERR(svn_client__ra_session_from_path(&source_ra_session, &rev2, &url2,
+ url2, NULL, peg_revision, &no_rev,
+ ctx, scratch_pool));
SVN_ERR(svn_wc__node_get_url(&target_url, ctx->wc_ctx, target_abspath,
scratch_pool, scratch_pool));
SVN_ERR(svn_client__open_ra_session_internal(&target_ra_session, NULL,
target_url,
NULL, NULL, FALSE, FALSE,
ctx, scratch_pool));
- SVN_ERR(svn_client__open_ra_session_internal(&source_ra_session, NULL,
- url2, NULL, NULL, FALSE, FALSE,
- ctx, scratch_pool));
-
- SVN_ERR(svn_client__get_revision_number(&rev2, NULL, ctx->wc_ctx,
- "",
- source_ra_session, peg_revision,
- scratch_pool));
SVN_ERR(calculate_left_hand_side(&url1, &rev1,
&merged_to_source_mergeinfo_catalog,