You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Arfrever Frehtes Taifersar Arahesis <ar...@gmail.com> on 2008/02/12 02:42:46 UTC
svn merge - Incorrect display with multiple "-r" / "-c" options
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.
--
Arfrever Frehtes Taifersar Arahesis
Re: svn merge - Incorrect display with multiple "-r" / "-c" options
Posted by Kamesh Jayachandran <ka...@collab.net>.
>> 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 .
>
>
Hi Arfrever,
It seems to be broken. I am looking at it.
With regards
Kamesh Jayachandran
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn merge - Incorrect display with multiple "-r" / "-c" options
Posted by Kamesh Jayachandran <ka...@collab.net>.
>> 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.
>
> Ah! Gotcha. Thanks for clarifying.
>
>> FYI: merge happens fine only the merge range notifications are missing.
>
> Okay. That was a key bit of information I was lacking.
>
Fixed in r29377.
With regards
Kamesh Jayachandran
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn merge - Incorrect display with multiple "-r" / "-c" options
Posted by "C. Michael Pilato" <cm...@collab.net>.
Kamesh Jayachandran wrote:
>>>> 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.
Ah! Gotcha. Thanks for clarifying.
> FYI: merge happens fine only the merge range notifications are missing.
Okay. That was a key bit of information I was lacking.
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: svn merge - Incorrect display with multiple "-r" / "-c" options
Posted by Kamesh Jayachandran <ka...@collab.net>.
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
>>>> <ar...@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@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn merge - Incorrect display with multiple "-r" / "-c" options
Posted by "C. Michael Pilato" <cm...@collab.net>.
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
>>> <ar...@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?
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: svn merge - Incorrect display with multiple "-r" / "-c" options
Posted by Kamesh Jayachandran <ka...@collab.net>.
>>> 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@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn merge - Incorrect display with multiple "-r" / "-c" options
Posted by Kamesh Jayachandran <ka...@collab.net>.
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
>> <ar...@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.
With regards
Kamesh Jayachandran
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn merge - Incorrect display with multiple "-r" / "-c" options
Posted by Arfrever Frehtes Taifersar Arahesis <ar...@gmail.com>.
2008-02-12 04:19:11 David Glasser napisał(a):
> On Feb 11, 2008 6:42 PM, Arfrever Frehtes Taifersar Arahesis
> <ar...@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 .
--
Arfrever Frehtes Taifersar Arahesis
Re: svn merge - Incorrect display with multiple "-r" / "-c" options
Posted by David Glasser <gl...@davidglasser.net>.
On Feb 11, 2008 6:42 PM, Arfrever Frehtes Taifersar Arahesis
<ar...@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?
thanks,
dave
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org