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

Re: URL-only renames adds svn:mergeinfo property

From: Daniel Becroft <djcbecroft_at_gmail.com>
Date: Fri, 19 Nov 2010 13:40:42 +1000

On Tue, Nov 16, 2010 at 3:54 PM, Daniel Becroft <djcbecroft_at_gmail.com>wrote:

> Hi,
>
> I've just found (another) issue with using URL-only renames. If one of the
> parent directories has svn:mergeinfo recorded on it, then renaming a file
> via a URL results in the new file containing a full copy of what was on the
> trunk (but cut down to the individual file).
>
> Please see the following output from my test script (using SVN 1.6.13):
>
> >svn merge file:///D:/temp/svn_sandpit/repository/trunk .
> --- Merging r4 through r5 into '.':
> U A\alpha.txt
>
> >svn commit . --message "Merge r5 from trunk to branch."
> Sending .
> Sending A\alpha.txt
> Transmitting file data .
> Committed revision 6.
>
> >svn propget svn:mergeinfo
> file:///D:/temp/svn_sandpit/repository/branches/branchA
> /trunk:4-5
>
> >svn propget svn:mergeinfo
> file:///D:/temp/svn_sandpit/repository/branches/branchA/A/alpha.txt
>
> >svn rename
> file:///D:/temp/svn_sandpit/repository/branches/branchA/A/alpha.txt
> file:///D:/temp/svn_sandpit/repository/branches/branchA/A/beta.txt --message
> "Rename alpha.txt to beta.txt on branchA."
> Committed revision 7.
>
> >svn propget svn:mergeinfo
> file:///D:/temp/svn_sandpit/repository/branches/branchA/A/beta.txt
> /trunk/A/alpha.txt:4-5
>
> Notice that the 'svn propget' on alpha.txt indicates that there is no
> svn:mergeinfo property available, but it gets added to beta.txt during the
> rename.
>
> Is this intended behavior?
>

Is anyone able to confirm if this is intended behavior? After further
testing, I get the same results if I run an 'svn copy' via URLs. However, I
do not get the svn:mergeinfo property added if I 'svn rename' or 'svn copy'
in my working copy.

Cheers,
Daniel B.
Received on 2010-11-19 04:41:43 CET

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