subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Bert Huijben <b...@qqmail.nl>
Subject RE: svn commit: r1591301 -/subversion/trunk/subversion/libsvn_client/mergeinfo.c
Date Wed, 30 Apr 2014 18:25:14 GMT
This might make us add svn:mergeinfo on nodes that didn't have this property before eliding,
while the old code tried to avoid that by checking to see if the value was inherited from
an ancestor.

Bert

-----Original Message-----
From: "julianfoad@apache.org" <julianfoad@apache.org>
Sent: ‎30-‎4-‎2014 16:12
To: "commits@subversion.apache.org" <commits@subversion.apache.org>
Subject: svn commit: r1591301 -/subversion/trunk/subversion/libsvn_client/mergeinfo.c

Author: julianfoad
Date: Wed Apr 30 14:12:08 2014
New Revision: 1591301

URL: http://svn.apache.org/r1591301
Log:
* subversion/libsvn_client/mergeinfo.c
  (svn_client__elide_mergeinfo): A tiny simplification: when we want only
    explicit mergeinfo, ask for only explicit mergeinfo.

Modified:
    subversion/trunk/subversion/libsvn_client/mergeinfo.c

Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=1591301&r1=1591300&r2=1591301&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Wed Apr 30 14:12:08 2014
@@ -922,13 +922,12 @@ svn_client__elide_mergeinfo(const char *
     {
       svn_mergeinfo_t target_mergeinfo;
       svn_mergeinfo_t mergeinfo = NULL;
-      svn_boolean_t inherited;
       const char *walk_path;
       svn_error_t *err;
 
       /* Get the TARGET_WCPATH's explicit mergeinfo. */
-      err = svn_client__get_wc_mergeinfo(&target_mergeinfo, &inherited,
-                                         svn_mergeinfo_inherited,
+      err = svn_client__get_wc_mergeinfo(&target_mergeinfo, NULL,
+                                         svn_mergeinfo_explicit,
                                          target_abspath,
                                          limit_abspath,
                                          &walk_path, FALSE,
@@ -951,7 +950,7 @@ svn_client__elide_mergeinfo(const char *
 
      /* If TARGET_WCPATH has no explicit mergeinfo, there's nothing to
          elide, we're done. */
-      if (inherited || target_mergeinfo == NULL)
+      if (target_mergeinfo == NULL)
         return SVN_NO_ERROR;
 
       /* Get TARGET_WCPATH's inherited mergeinfo from the WC. */



Mime
View raw message