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

RE: Re: [PATCH] Warn when attempting to reverse merge range from target's future history

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: Tue, 19 Feb 2008 23:51:03 +0530

>> Comment2:
>>
>> Why should we use 'svn_client__repos_locations' to get the URL of
>> ulr1_at_revision1 at entry->revision? Is it needed?

>Keep in mind that this warning is only intended to show up when the
>merge target described by entry->revision is on the *same* line of
>history as URL1_at_REVISION1 (due to merge source normalization we
>already know that URL2_at_REVISION2 is on the same line of history as
>URL1_at_REVISION1). So the call to svn_client__repos_locations() is
>needed to answer the question of whether or not we are merging from a
>target's future history. If we are not, then there shouldn't be a
>warning...

>...or are you suggesting that we should warn even when merging from an
>unrelated source?
 
No.
IIUC we do merges on each location segments separately. I am having a
tough time to visualize the case when this patch would be exercised with
url1_at_entry->revision being different from entry->url.

With regards
Kamesh Jayachandran
Received on 2008-02-19 19:21:17 CET

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