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

Re: Incorrect svn:mergeinfo properties

From: Mark Phippard <markphip_at_gmail.com>
Date: Thu, 9 Oct 2008 15:35:47 -0400

On Thu, Oct 9, 2008 at 3:31 PM, Eric (Brad) Lemings <brad_at_rebit.com> wrote:
> Mark Phippard wrote:
>> On Thu, Oct 9, 2008 at 1:59 PM, Eric (Brad) Lemings <brad_at_rebit.com> wrote:
>>> I just noticed that when I do an 'svn copy' from trunk to a branch, the
>>> svn:mergeinfo property is not reflecting this. Example:
>>> $ svn copy trunk/software/ComponentA/ComponentA.cpp
>>> branch/ebl-2008-09-09/library/ComponentA
>>> A branch/ebl-2008-09-09/library/ComponentA/ComponentA.cpp
>>> $ cd branch/ebl-2008-09-09
>>> $ svn propget svn:mergeinfo library/ComponentA/ComponentA.cpp
>>> /Rebit3/branch/3914-XX-YYYY-Z/software/ComponentA/ComponentA.cpp:3922-3930,3945-3949
>>> Uhh, what's going on here?
>> It is not supposed to create mergeinfo for a copy. The "natural
>> history" of a file is already known without creating any value in the
>> property. The only thing that comes through in the property is the
>> contents of the property being copied.
>> If you run the same propget command on the file in trunk presumably it
>> already contained that value?
> Not the file itself but the 'trunk' directory did. I guess it was
> inherited. Thanks for the tip.
> Just curious though, if Subversion tracks history separately from the
> svn:mergeinfo property, what is that property used for?

The only history that the Subversion repository already has is that of
the copy. After that you have two separate lines of history. Merge
tracking records information about the merges.

So technically that mergeinfo that was added probably did not need to
be. You can delete it if you want (probably should). We are working
on enhancing the copy process to be more selective about when it does

Mark Phippard
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-10-09 21:36:11 CEST

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

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