[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r1146149 - in /subversion/trunk: ./ subversion/include/private/ subversion/libsvn_fs_fs/ subversion/libsvn_subr/

From: Stefan Fuhrmann <stefanfuhrmann_at_alice-dsl.de>
Date: Fri, 15 Jul 2011 20:06:42 +0200

On 14.07.2011 16:46, Paul Burba wrote:
> On Wed, Jul 13, 2011 at 6:43 PM, Mark Phippard<markphip_at_gmail.com> wrote:
>> See:
>>
>> http://subversion.apache.org/docs/release-notes/1.7.html#subtree-mergeinfo-recording
>>
>> Sent from my iPhone
>>
>> On Jul 13, 2011, at 6:29 PM, Peter Samuelson<peter_at_p12n.org> wrote:
>>
>>> [Greg Stein]
>>>> Is there any way that we can remove the svn:mergeinfo property from
>>>> those files? I'm not sure if that would be Proper, or if that would
>>>> bust something up.
> (stefan2: I'm ccing you to draw your attention to some changes you
> made in r1067669, r1067674, and r1081136. Could you confirm or
> correct my understanding as to what you did? See below).
>
> Hi Greg,
>
> It depends on why the subtree mergeinfo is there in the first place.
> Right now on trunk we have the following subtrees with mergeinfo:
>
> (subversion\libsvn_fs_fs\temp_serializer.c):
> (subversion\libsvn_fs_fs\temp_serializer.h):
> (subversion\include\private\svn_temp_serializer.h):
> (subversion\libsvn_subr\svn_temp_serializer.c):
> Due to a --record-only merge "from the performance branch as all these
> changes are already present in /trunk" in r1081136.
Hi Paul, hi Greg,

This merge info has no particular significance anymore.
It stems from cherry-picking merges I did long ago. But
merging the remaining bits and pieces from the performance
branch other than the file handle cache will require manual
intervention in any case.

So, feel free to remove the local mergeinfo as it probably
won't be helpful anymore anyways.

-- Stefan^2.
Received on 2011-07-15 20:07:16 CEST

This is an archived mail posted to the Subversion Dev mailing list.