Author: hwright
Date: Thu Aug 4 20:18:04 2011
New Revision: 1153994
URL: http://svn.apache.org/viewvc?rev=1153994&view=rev
Log:
Merge r1152140 from trunk:
* r1152140
Resolve assertion when performing svn merge --reintegrate PATH .
Justification:
User triggerable assertions are bad.
Notes:
This just replaces the assertion with a proper error. You should
pass PATH@rev for this to work.
Votes:
+1: rhuijben, pburba, gstein
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_client/merge.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 4 20:18:04 2011
@@ -54,4 +54,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149675,1149701,1149713,1150242,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151911,1152129,1152282,1152726,1153416,1153799,1153807
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149675,1149701,1149713,1150242,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151911,1152129,1152140,1152282,1152726,1153416,1153799,1153807
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1153994&r1=1153993&r2=1153994&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Aug 4 20:18:04 2011
@@ -210,16 +210,6 @@ Approved changes:
Votes:
+1: rhuijben, danielsh, cmpilato
- * r1152140
- Resolve assertion when performing svn merge --reintegrate PATH .
- Justification:
- User triggerable assertions are bad.
- Notes:
- This just replaces the assertion with a proper error. You should
- pass PATH@rev for this to work.
- Votes:
- +1: rhuijben, pburba, gstein
-
* r1149627
Adjust library order in build.conf for kwallet/gnome-keyring.
Justification:
Modified: subversion/branches/1.7.x/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_client/merge.c?rev=1153994&r1=1153993&r2=1153994&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_client/merge.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_client/merge.c Thu Aug 4
20:18:04 2011
@@ -10526,6 +10526,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));
@@ -10597,20 +10598,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,
