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

Re: Useless explicit mergeinfo records

From: Ivan Zhakov <chemodax_at_gmail.com>
Date: Thu, 28 Aug 2008 08:44:01 +0200

On Wed, Aug 27, 2008 at 6:29 PM, C. Michael Pilato <cmpilato_at_collab.net> wrote:
> Danil Shopyrin wrote:
>>>> 2) Mergeinfo produced during WC-to-WC copy differs from equivalent
>>>> REPO-to-REPO copy. If you copy file in working copy and there is no
>>>> mergeinfo in the working copy then the new file will get an empty
>>>> mergeinfo record. Similar REPO-to-REPO copy operation doesn't produce
>>>> empty mergeinfo record.
>>>> This problem was already discussed here:
>>>> http://svn.haxx.se/users/archive-2008-08/0471.shtml
>>> That's correct. A WC-to-WC copy isn't allowed to speak to the repository,
>>> so it doesn't have the opportunity to verify that "no mergeinfo" is the
>>> correct result. To be safe, it sets empty mergeinfo (to block any
>>> inheritence it couldn't have foreseen due to lack of repository access). As
>>> you note below, though, there are some cases when we can be smarter about this.
>> Can appropriate checks be done at commit stage? The logic can be as
>> follows: if we have "added and copied" paths then we should compute
>> appropriate mergeinfo for them. As I understand, there is no problems
>> with connection to the repository at commit stage.
> We toyed with this, but the problem (or one of the problems) we ran into was
> what happened if you performed a copy (perhaps to make a local branch), then
> tried to merge into it. The merge needs that mergeinfo as much as commit
> might. And maybe the answer there that 'merge' also grows the ability to
> detect stale-and-in-need-of-network-refreshing mergeinfo on working copy
> members, and does said refreshing before performing its primary task. I dunno.
Another option is create empty svn:mergeinfo on copy when we cannot is
it inherited or not and resolve svn:mergeinfo on the commit. Only
problem is commit could be slightly different from what user see in
svn status.

But we could consider svn:mergeinfo as special property and maybe
never show it in svn status?

Ivan Zhakov
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-08-28 08:44:15 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.