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

[Daniel Rall]

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"?

- Dan
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20061208/77755819/attachment-0002.pgp>