[Svnmerge] [PATCH] Bidirectional patch take 2

[Raman Gupta]

Blair Zajac wrote:
> Raman Gupta wrote:
>> Blair Zajac wrote:
>>
>>
>>>>>>    # merged_revs, we do not need to check those.
>>>>>>    base = 1
>>>>>>    r = opts["merged_revs"].normalized()
>>>>>>    if r and r[0][0] == 1:
>>>>>> -        base = r[0][1]
>>>>>> +        base = r[0][1] + 1
>>>
>>> If Raman or Giovanni want to come up with a test suite for this fix,
>>> then we can get this fix in.  I didn't commit this one line change.
>>
>> I think the existing test cases that already cover this. You can verify
>> the code path is exercised by changing it to base = r[0][1] + 2 -- about
>> 3 or 4 tests will fail. At + 1, no tests will fail that aren't failing
>> for other reasons (see my note below).
> 
> I think the test should be if the same result is generated with the
> 'base = r[0][1]' or the 'base = r[0][1] + 1', not if it'll break with +2.

Well, yes, my point about the + 2 was only to indicate that the existing
test cases covered that code path.  The salient point in my statement
was that the same results in those tests are seen with r[0][1] and
r[0][1] + 1.

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

Cheers,
Raman
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 3448 bytes
Desc: S/MIME Cryptographic Signature
Url : /pipermail/svnmerge/attachments/20060227/14ab2ac0/attachment.bin