[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 19:04:43 +0300

On Wed, Sep 10, 2008 at 6:54 PM, Vlad Georgescu <vgeorgescu_at_gmail.com> wrote:
> On Wed, Sep 10, 2008 at 5:44 PM, Mark Phippard <markphip_at_gmail.com> wrote:
>> On Wed, Sep 10, 2008 at 10:37 AM, C. Michael Pilato <cmpilato_at_collab.net> wrote:
> [...]
>>>> Is it possible to do the logic at commit time and discard the property
>>>> if it is not needed?
>>>
>>> I trust you mean, "to *also* do the logic at commit time"? We already
>>> discussed how delaying the logic altogether could mean corrupting merges
>>> made into a copied-but-uncommitted directory. And I would suspect that
>>> introducing the commit-time mergeinfo calculation has its own problems (at
>>> the very least, WC schema changes to persist the previously calculated
>>> value, complexity to ensure that we aren't blowing away a user's 'svn merge
>>> --record-only' results, etc.)
>>>
>>> It suspect it can be done. I suspect it comes with a great price of
>>> complexity and special-cased-ness.
>>
>> Vlad seems to have a valid point that this does not even need to be
>> done. But what I was suggesting is that the way I think this works
>> today is that we currently create empty mergeinfo and at commit time
>> some work is done to fill in the mergeinfo with the right values.
>> Maybe I am wrong about that? But what does not happen is any logic to
>> determine that the property was not needed and discard it.
>>
>> The commit time part is just about waiting until we have a repository
>> connection which is why I thought we created the empty mergeinfo in
>> the first place.
>
> Yeah, I was thinking that at commit time, if we detect empty mergeinfo
> on an added-with-history entry we can get the inherited mergeinfo for
> the source and destination and either remove the mergeinfo if they're
> equal or set it to the correct value otherwise.

I realize after rereading cmpilato's mail that it's not as simple as
that. All the more reason to avoid setting empty mergeinfo, then.

-- 
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 18:04:59 CEST

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