You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2011/07/14 21:40:26 UTC
svn commit: r1146870 - /subversion/trunk/subversion/libsvn_client/merge.c
Author: pburba
Date: Thu Jul 14 19:40:25 2011
New Revision: 1146870
URL: http://svn.apache.org/viewvc?rev=1146870&view=rev
Log:
Follow-up to issue #3242 'Subversion demands unnecessary access to parent
directories of operations' fixe in r946767.
This fixes issue #3957 'reintegrate fails with no subtree mergeinfo on
source' on 1.6.x. Or at least it will, once backported.
* subversion/libsvn_client/merge.c
(find_unmerged_mergeinfo): Since r946767 the call to svn_ra_get_mergeinfo2
used a ra_session rooted at the reintegrate *source* not the root of the
repository. Since the path keys in the returned catalog are relative to
the session we need to use relative paths when getting mergeinfo from
the catalog.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1146870&r1=1146869&r2=1146870&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Jul 14 19:40:25 2011
@@ -10035,7 +10035,8 @@ find_unmerged_mergeinfo(svn_mergeinfo_ca
FALSE, FALSE,
iterpool));
if (subtree_catalog)
- source_mergeinfo = apr_hash_get(subtree_catalog, source_path,
+ source_mergeinfo = apr_hash_get(subtree_catalog,
+ source_path_rel_to_session,
APR_HASH_KEY_STRING);
/* A path might not have any inherited mergeinfo either. */
Re: svn commit: r1146870 - /subversion/trunk/subversion/libsvn_client/merge.c
Posted by Paul Burba <pt...@gmail.com>.
On Thu, Jul 14, 2011 at 5:37 PM, Bert Huijben <be...@qqmail.nl> wrote:
>
>> -----Original Message-----
>> From: pburba@apache.org [mailto:pburba@apache.org]
>> Sent: donderdag 14 juli 2011 21:40
>> To: commits@subversion.apache.org
>> Subject: svn commit: r1146870 -
>> /subversion/trunk/subversion/libsvn_client/merge.c
>>
>> Author: pburba
>> Date: Thu Jul 14 19:40:25 2011
>> New Revision: 1146870
>>
>> URL: http://svn.apache.org/viewvc?rev=1146870&view=rev
>> Log:
>> Follow-up to issue #3242 'Subversion demands unnecessary access to parent
>> directories of operations' fixe in r946767.
>>
>> This fixes issue #3957 'reintegrate fails with no subtree mergeinfo on
>> source' on 1.6.x. Or at least it will, once backported.
>
> Should this fix be backported to 1.7.x too?
Hi Bert,
I first want to fully wrap my head around why this obvious bug isn't a
problem on trunk/1.7.x - see
http://subversion.tigris.org/issues/show_bug.cgi?id=3957#desc8 Might
be that some of this code can be done away with.
Paul
> Bert
>
>
RE: svn commit: r1146870 - /subversion/trunk/subversion/libsvn_client/merge.c
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: pburba@apache.org [mailto:pburba@apache.org]
> Sent: donderdag 14 juli 2011 21:40
> To: commits@subversion.apache.org
> Subject: svn commit: r1146870 -
> /subversion/trunk/subversion/libsvn_client/merge.c
>
> Author: pburba
> Date: Thu Jul 14 19:40:25 2011
> New Revision: 1146870
>
> URL: http://svn.apache.org/viewvc?rev=1146870&view=rev
> Log:
> Follow-up to issue #3242 'Subversion demands unnecessary access to parent
> directories of operations' fixe in r946767.
>
> This fixes issue #3957 'reintegrate fails with no subtree mergeinfo on
> source' on 1.6.x. Or at least it will, once backported.
Should this fix be backported to 1.7.x too?
Bert