[Svnmerge] [PATCH] Bidirectional patch take 2

[Raman Gupta]

Raman Gupta wrote:
> Blair Zajac wrote:
>> Raman Gupta wrote:
>>> Note that with the latest versions in the collabnet repo, the
>>> testBidirectionalMerges test always fails for me, even with the
>>> non-modified version, at this chunk:
>>>
>>>         # There will be directory property conflict on 'test-branch'
>>>         # due to the attempted merge from trunk of the addition of the
>>>         # svnmerge-integrated property, which already exists in the
>>>         # branch since 'svnmerge.py init' was run in it.  So just
>>>         # resolve it, as it currently has the correct value.
>>>         self.launch("svn resolved .",
>>>                     match=r"Resolved conflicted state of '\.'")
>>>
>>> I don't recall putting this chunk in my patch, so this must be something
>>> Blair added.
>> I tried your original patch against Giovanni's repository and needed
>> this fix in there to get it to work.
> 
> That's weird, I didn't need it then, and I also don't seem to need it
> now (using the latest versions from collabnet with no patches). I am
> using svn 1.2.3. What version are you using?

I replicated the issue using svn 1.3.0. The attached patch should fix
the underlying problem rather than masking the symptom. I believe the
reason is that repeated discontinuous merges cause conflicts with the
svnmerge-integrated property. The attached patch reverts those changes,
if any, after each merge, which should be fine because the last
operation is to set the svnmerge-integrated property to its correct
value. Can anyone think of a reason not to do this?

Cheers,
Raman

-------------- next part --------------
A non-text attachment was scrubbed...
Name: revert.patch
Type: text/x-patch
Size: 1461 bytes
Desc: not available
Url : /pipermail/svnmerge/attachments/20060227/2dd397e8/attachment.bin