[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: Thu, 14 Feb 2008 19:41:10 +0530

C. Michael Pilato wrote:
> Kamesh Jayachandran wrote:
>>
>>
>> Arfrever Frehtes Taifersar Arahesis wrote:
>>> 2008-02-12 04:19:11 David Glasser napisa?(a):
>>>
>>>> On Feb 11, 2008 6:42 PM, Arfrever Frehtes Taifersar Arahesis
>>>> <arfrever.fta_at_gmail.com> wrote:
>>>>
>>>>> When multiple "-r" / "-c" options are passed to `svn merge`, then
>>>>> the "--- Merging r%ld into '%s':\n" message (or similar) is displayed
>>>>> only for the first merged revision.
>>>>>
>>>> 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.
>
> Kamesh, are you indicating with this comment that you think the
> behavior is expected and/or correct? If so, can you explain this?

It is what I observed, I am not sure what causes the pre-1.5 server +
1.5 client to miss out the notification. Let me dig the details.

FYI: merge happens fine only the merge range notifications are missing.

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-14 15:11:50 CET

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