You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2013/04/23 06:00:59 UTC
svn commit: r1470806 - in /subversion/branches/1.8.x: ./ STATUS
subversion/libsvn_client/merge.c
Author: svn-role
Date: Tue Apr 23 04:00:58 2013
New Revision: 1470806
URL: http://svn.apache.org/r1470806
Log:
Merge r1469550 from trunk:
* r1469550
Fix a potential segfault in merge.
Justification:
It's a segfault (though I haven't bothered to make it happen)
Votes:
+1: breser, philip, rhuijben
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_client/merge.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1469550
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1470806&r1=1470805&r2=1470806&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Apr 23 04:00:58 2013
@@ -88,13 +88,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1469550
- Fix a potential segfault in merge.
- Justification:
- It's a segfault (though I haven't bothered to make it happen)
- Votes:
- +1: breser, philip, rhuijben
-
* r1469556
Load hooks env in svn_repos_fs_change_rev_prop4() properly.
Justification:
Modified: subversion/branches/1.8.x/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_client/merge.c?rev=1470806&r1=1470805&r2=1470806&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_client/merge.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_client/merge.c Tue Apr 23 04:00:58 2013
@@ -11444,10 +11444,6 @@ find_reintegrate_merge(merge_source_t **
&yc_ancestor, source.loc2, source.loc1, target_ra_session,
ctx, scratch_pool, scratch_pool));
- /* The source side of a reintegrate merge is not 'ancestral', except in
- * the degenerate case where source == YCA. */
- source.ancestral = (loc1->rev == yc_ancestor->rev);
-
if (! yc_ancestor)
return svn_error_createf(SVN_ERR_CLIENT_NOT_READY_TO_MERGE, NULL,
_("'%s@%ld' must be ancestrally related to "
@@ -11455,6 +11451,10 @@ find_reintegrate_merge(merge_source_t **
source.loc1->url, source.loc1->rev,
source.loc2->url, source.loc2->rev);
+ /* The source side of a reintegrate merge is not 'ancestral', except in
+ * the degenerate case where source == YCA. */
+ source.ancestral = (loc1->rev == yc_ancestor->rev);
+
if (source.loc1->rev > yc_ancestor->rev)
{
/* Have we actually merged anything to the source from the