[Svnmerge] [PATCH] Use bi-directional property merge code for uni-directional merges

[Blair Zajac]

On Dec 8, 2006, at 3:15 PM, Daniel Rall wrote:

> On Fri, 08 Dec 2006, Blair Zajac wrote:
>
>> I found a case where I'm getting merge conflicts on the svnmerge- 
>> integrated
>> property with unidirectional merges and the code that merges  
>> svnmerge-integrated
>> for bi-directional merges handles fixes this issue, so I'm  
>> considering applying
>> the below patch.
>>
>> Here's the recipe.  It makes a trunk and two branches, a qa and a  
>> production
>> branch, where the production branch is copied from the qa branch.
>>
>> The branches are made before svnmerge's properties are set up.
>>
>> If nobody has any issues, I'll commit this change.
>
> Blair, this is the same patch as Raman suggested a month or so ago.
> The thread "Eliminate spurious svnmerge-integrated property" is a
> response to his patch, with some test case additions from me.
>
> Does this patch impact "transitive merge info"?

I think it breaks transitive merges.

With my reproduction recipe, the merge info is set up after the  
branches are created and then the first merge info is set up, which  
would be merged into the second branch.  This information is correct  
is correct in how it ends up in the second branch, so with the patch,  
it removes this additional merge info that ends up in the second branch.

So after reviewing this, I believe the patch is not good:

svn cp trunk branches/qa
svn commit -m ''
svn cp branches/qa branches/production
svn commit -m ''

cd branches/qa
svnmerge.py init
svn commit -F svnmerge-commit-message.txt

cd ../production
svnmerge.py init
svn commit -F svnmerge-commit-message.txt

cd ../../trunk
echo hello > foo
svn ci -m ''

cd ../branches/qa
svnmerge.py merge
svn commit -F svnmerge-commit-message.txt

cd ../production

# This gets a conflict
svnmerge merge


# With the patch, the production branch has only merge info from the  
qa branch, when it should have it from trunk also.

Regards,
Blair

-- 
Blair Zajac, Ph.D.
<blair at orcaware.com>
http://www.orcaware.com/svn/