You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by "Eric (Brad) Lemings" <br...@rebit.com> on 2008/10/09 17:59:43 UTC
Incorrect svn:mergeinfo properties
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?
Thanks,
Eric.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Incorrect svn:mergeinfo properties
Posted by Mark Phippard <ma...@gmail.com>.
On Thu, Oct 9, 2008 at 3:31 PM, Eric (Brad) Lemings <br...@rebit.com> wrote:
> Mark Phippard wrote:
>> On Thu, Oct 9, 2008 at 1:59 PM, Eric (Brad) Lemings <br...@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
that.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Incorrect svn:mergeinfo properties
Posted by "Eric (Brad) Lemings" <br...@rebit.com>.
Mark Phippard wrote:
> On Thu, Oct 9, 2008 at 1:59 PM, Eric (Brad) Lemings <br...@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?
Eric.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Incorrect svn:mergeinfo properties
Posted by Mark Phippard <ma...@gmail.com>.
On Thu, Oct 9, 2008 at 1:59 PM, Eric (Brad) Lemings <br...@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?
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org