[prev in list] [next in list] [prev in thread] [next in thread]
List: subversion-commits
Subject: RE: svn commit: r1591301 -/subversion/trunk/subversion/libsvn_client/mergeinfo.c
From: Bert Huijben <bert () qqmail ! nl>
Date: 2014-04-30 18:25:14
Message-ID: 5361402a.01ae0e0a.62b1.2c35 () mx ! google ! com
[Download RAW message or body]
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. */
[Attachment #3 (unknown)]
<html><head><meta http-equiv="Content-Type" content="text/html; \
charset=utf-8"></head><body><div><div style="font-family: Calibri,sans-serif; \
font-size: 11pt;">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.<br><br>Bert</div></div><div \
dir="ltr"><hr><span style="font-family: Calibri,sans-serif; font-size: 11pt; \
font-weight: bold;">From: </span><span style="font-family: Calibri,sans-serif; \
font-size: 11pt;"><a \
href="mailto:julianfoad@apache.org">julianfoad@apache.org</a></span><br><span \
style="font-family: Calibri,sans-serif; font-size: 11pt; font-weight: bold;">Sent: \
</span><span style="font-family: Calibri,sans-serif; font-size: \
11pt;">30-4-2014 16:12</span><br><span style="font-family: \
Calibri,sans-serif; font-size: 11pt; font-weight: bold;">To: </span><span \
style="font-family: Calibri,sans-serif; font-size: 11pt;"><a \
href="mailto:commits@subversion.apache.org">commits@subversion.apache.org</a></span><br><span \
style="font-family: Calibri,sans-serif; font-size: 11pt; font-weight: bold;">Subject: \
</span><span style="font-family: Calibri,sans-serif; font-size: 11pt;">svn commit: \
r1591301 -/subversion/trunk/subversion/libsvn_client/mergeinfo.c</span><br><br></div>Author: \
julianfoad<br>Date: Wed Apr 30 14:12:08 2014<br>New Revision: 1591301<br><br>URL: \
http://svn.apache.org/r1591301<br>Log:<br>* \
subversion/libsvn_client/mergeinfo.c<br> (svn_client__elide_mergeinfo): A tiny \
simplification: when we want only<br> explicit mergeinfo, ask for \
only explicit mergeinfo.<br><br>Modified:<br> \
subversion/trunk/subversion/libsvn_client/mergeinfo.c<br><br>Modified: \
subversion/trunk/subversion/libsvn_client/mergeinfo.c<br>URL: \
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev \
=1591301&r1=1591300&r2=1591301&view=diff<br>==============================================================================<br>--- \
subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)<br>+++ \
subversion/trunk/subversion/libsvn_client/mergeinfo.c Wed Apr 30 14:12:08 2014<br>@@ \
-922,13 +922,12 @@ svn_client__elide_mergeinfo(const char \
*<br> {<br> \
svn_mergeinfo_t target_mergeinfo;<br> \
svn_mergeinfo_t mergeinfo = NULL;<br>- svn_boolean_t \
inherited;<br> const char \
*walk_path;<br> svn_error_t *err;<br> \
<br> /* Get the TARGET_WCPATH's explicit \
mergeinfo. */<br>- err = \
svn_client__get_wc_mergeinfo(&target_mergeinfo, \
&inherited,<br>- \
&n \
bsp; \
svn_mergeinfo_inherited,<br>+ err = \
svn_client__get_wc_mergeinfo(&target_mergeinfo, \
NULL,<br>+ &nbs \
p; \
svn_mergeinfo_explicit,<br>   \
; & \
nbsp; \
target_abspath,<br> & \
nbsp; &nb \
sp; \
limit_abspath,<br> &n \
bsp; &nbs \
p; \
&walk_path, FALSE,<br>@@ -951,7 +950,7 @@ svn_client__elide_mergeinfo(const char \
*<br> <br> /* If TARGET_WCPATH has no explicit \
mergeinfo, there's nothing \
to<br> elide, we're done. \
*/<br>- if (inherited || target_mergeinfo == \
NULL)<br>+ if (target_mergeinfo == \
NULL)<br> return SVN_NO_ERROR;<br> \
<br> /* Get TARGET_WCPATH's inherited mergeinfo \
from the WC. */<br><br><br></body></html>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic