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

Re: svn 1.5 merge tracking svn:mergeinfo and svn diff --summarize

From: Mark Phippard <markphip_at_gmail.com>
Date: Wed, 23 Jul 2008 11:09:06 -0400

On Wed, Jul 23, 2008 at 11:04 AM, Michael Reinelt <michael_at_reinelt.co.at> wrote:
>> On Wed, Jul 23, 2008 at 8:45 AM, Michael Reinelt <michael_at_reinelt.co.at> wrote:
>>
>>> - is there a possibility to deactivate the whole merge-tracking with
>>> 1.5? (I don't need it at the moment, maybe later)
>>
>> Just keep your repository at the 1.4 format. Do not run svnadmin upgrade on it.
> Well, I did not. I didn't even know that I should/could upgrade....
>
> I did not test wether the tracking itself works, I just noticed that
> these properties have been set. Maybe the client should not touch these
> properties with an 1.4 repo?

The Subversion 1.5 client will not create or set mergeinfo properties
with a 1.4 repository. At least not when merges are performed. I
might have seen someone suggest that a rename creates and commits
these properties, but I have not seen confirmation or an issue filed.

>>> - is there a way to tell 'svn diff' and 'svn merge' to ignore the
>>> svn:mergeinfo property? (other properties must not be ignored, they are
>>> important for my setup and need to be ported from one branch to the other)
>>
>> Not currently. These changes also show in svn log.
>
> Too bad. This means I have to stick with 1.4?

I do not think you need to. The Subclipse repository, hosted at
tigris, runs SVN 1.3. It does not have any mergeinfo properties being
created. And I use 1.5 as client exclusively.

> Will this be corrected^Wimplemented someday? SHall I report it somewhere
> else?

AFAIK, no one has asked to have svn:mergeinfo excluded from diff output.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-23 17:09:31 CEST

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