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

Hi Mark,

>>>> - 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.

Would it be of any help if I'd prepare a test scenario with a 1.4 repo
and a 1.5 client creating this properties?

The only thing I remember that some of the merges have been "replaces"
indicated by a capital R in the first colunm of 'svn stat'. Maybe this
is the reason?

>>>> - is there a way to tell 'svn diff' and 'svn merge' to ignore the
>>>> svn:mergeinfo property?

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

Well, then I'm the first one raising his hand :-)

Shall I ask somewhere else, too?

TIA, Michael

-- 
Michael Reinelt <michael_at_reinelt.co.at>
http://home.pages.at/reinelt
GPG-Key 0xDF13BA50
ICQ #288386781
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org