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

Re: svn merge - Incorrect display with multiple "-r" / "-c" options

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: Fri, 15 Feb 2008 18:22:37 +0530

>>> Can you give a full reproduction recipe?
>>>
>>
>> svn co https://svn.collab.net/repos/svn/branches/1.5.x svn_1.5.x
>> cd svn_1.5.x
>> svn merge -c29185 -c29186 -c29188
>> https://svn.collab.net/repos/svn/trunk .
>>
>>
>
> This happens *only* when 1.5 client interacts with pre-1.5 servers not
> when it interacts with 1.5 server.
>

> Running 1.5's 'svnadmin upgrade' on the relevant repo fixes it.

This is a wrong observation, today without running 'svnadmin upgrade', I
can do merges, just that mergeinfo is not recorded on the target as the
code reflects.

With regards
Kamesh Jayachandran

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-02-15 13:53:17 CET

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