unexpected mergeinfo results (v1.6.13)
From: Wöster Benjamin <B.Woester_at_cadenas.de>
Date: Thu, 28 Oct 2010 22:40:28 +0200
Hi all,
I'm currently trying to clean up explicit mergeinfos that are scattered throughout our repository.
I've attached a perl script, that will reproduce a sample environment (it needs svn and svnadmin to be in your path).
This is the point where I am with my productive repository, and it turns out, that the cherry-picked revisions cause the behavior I wouldn't have expected.
# creating the test data
28.10.2010 20:33 <DIR> .
# navigate to the cleanup branch
# checking for the non-inheritable merge info
So here it is. My understanding of the mergeinfo and the mergeinfo elision is, that once these revisions get merged into the children of that path,
(first with svn 1.6.12, which behaves the way I expected it to work)
c:\mergeinfo\wc\branches\cleanup>svn -version
c:\mergeinfo\wc\branches\cleanup>svn merge -r 3:4 --record-only "^/trunk/folder_1" folder_1
c:\mergeinfo\wc\branches\cleanup>svn pg svn:mergeinfo folder_1
So we see: r4 is no longer been marked as non-inheritable, but since it still contains other non-inheritable mergeinfos,
(now the same with the newer svn 1.6.13)
c:\mergeinfo\wc\branches\cleanup>svn revert . -R
c:\mergeinfo\wc\branches\cleanup>"c:\Program Files\Subversion\bin\svn.exe" --version
c:\mergeinfo\wc\branches\cleanup>"c:\Program Files\Subversion\bin\svn.exe" merge -r 3:4 --record-only "^/trunk/folder_1" folder_1
c:\mergeinfo\wc\branches\cleanup>svn pg svn:mergeinfo folder_1 -R
Now, this is what I don't understand. I merged (well, recorded) the changes of revision 4 into a fully recursive working copy.
I'm unsure if this behavior is intended. It's correct that none of the changes would have ever touched those files,
So what do you think? Is this behavior intended or did something go wrong between v1.6.12 and 1.6.13?
Thanks in advance!
Greetings,
|
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.