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

Re: [PATCH] no mergeinfo on 'mergeinfo NON-affecting' wc-to-wc copy

From: Vlad Georgescu <vgeorgescu_at_gmail.com>
Date: Wed, 10 Sep 2008 18:32:52 +0300

On Wed, Sep 10, 2008 at 6:11 PM, Fyodor Sheremetyev
<fyodor_at_visualsvn.com> wrote:
> On Wed, Sep 10, 2008 at 6:35 PM, Vlad Georgescu <vgeorgescu_at_gmail.com> wrote:
>> On Wed, Sep 10, 2008 at 5:27 PM, C. Michael Pilato <cmpilato_at_collab.net> wrote:
>>> Vlad Georgescu wrote:
>>>> 2. Figure out which path the destination inherits mergeinfo from, if any.
>>>
>>> ...making sure to honor the wc-to-wc copy's promise not to talk to the
>>> repository. If, in this scenario, you don't find any inheritable
>>> mergeinfo in a working copy parent, you must not assume that *no*
>>> parent has mergeinfo (since maybe you only checked out /trunk/project
>>> but it's /trunk that carries the mergeinfo). Unless you can otherwise
>>> determine that's safe not to do so in this case, you must continue to
>>> set the empty mergeinfo property on the copy destination.
>>
>> We don't need to know exactly which path the destination or the source
>> inherit from. If neither inherits from a path in the WC, it means that
>> either:
>> a) there's really no inheritable mergeinfo at all, so we shouldn't set
>> empty mergeinfo
>> b) there's mergeinfo in a path above the wc root, but in this case
>> both the source and the destination inherit it, so there's no need to
>> set empty mergeinfo.
>
> c) source and destination are from different working copies.
>

Yes. In this case svn_client__get_wc_mergeinfo() can return the last
path that was checked for mergeinfo. If the paths differ and are not
in the same directory, then we give up and set empty mergeinfo.

-- 
Vlad
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-10 17:33:11 CEST

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