subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1489702 - in /subversion/branches/1.8.x: ./ STATUS subversion/libsvn_client/merge.c
Date Wed, 05 Jun 2013 04:01:01 GMT
Author: svn-role
Date: Wed Jun  5 04:01:01 2013
New Revision: 1489702

URL: http://svn.apache.org/r1489702
Log:
Merge r1488183 from trunk:

 * r1488183
   Check target WC for mixed revisions, local modifications and switched
   subtrees before contacting server for merge calculations.
   Justification:
     Merge calculations can easy take 10 seconds over WAN, while mixed
     revisions working copy are common. Small fix.
   Votes:
     +1: ivan, philip, julianfoad

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:r1488183

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1489702&r1=1489701&r2=1489702&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Jun  5 04:01:01 2013
@@ -62,12 +62,3 @@ Approved changes:
 # that would restart the soak should not be added unless they are resolving
 # blocking issues.  If in doubt see this link for details:
 # http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
-
- * r1488183
-   Check target WC for mixed revisions, local modifications and switched
-   subtrees before contacting server for merge calculations.
-   Justification:
-     Merge calculations can easy take 10 seconds over WAN, while mixed
-     revisions working copy are common. Small fix.
-   Votes:
-     +1: ivan, philip, julianfoad

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=1489702&r1=1489701&r2=1489702&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_client/merge.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_client/merge.c Wed Jun  5 04:01:01 2013
@@ -12415,14 +12415,15 @@ client_find_automatic_merge(automatic_me
   source_and_target_t *s_t = apr_palloc(result_pool, sizeof(*s_t));
   automatic_merge_t *merge = apr_palloc(result_pool, sizeof(*merge));
 
-  /* "Open" the target WC.  We're not going to check the target WC for
-   * mixed-rev, local mods or switched subtrees yet.  After we find out
-   * what kind of merge is required, then if a reintegrate-like merge is
-   * required we'll do the stricter checks, in do_automatic_merge_locked(). */
+  /* "Open" the target WC.  Check the target WC for mixed-rev, local mods and
+   * switched subtrees yet to faster exit and notify user before contacting
+   * with server.  After we find out what kind of merge is required, then if a
+   * reintegrate-like merge is required we'll do the stricter checks, in
+   * do_automatic_merge_locked(). */
   SVN_ERR(open_target_wc(&s_t->target, target_abspath,
-                         TRUE /*allow_mixed_rev*/,
-                         TRUE /*allow_local_mods*/,
-                         TRUE /*allow_switched_subtrees*/,
+                         allow_mixed_rev,
+                         allow_local_mods,
+                         allow_switched_subtrees,
                          ctx, result_pool, scratch_pool));
 
   /* Open RA sessions to the source and target trees. */



Mime
View raw message