[Svnmerge] Re: svn commit: r18648 - trunk/contrib/client-side

[Giovanni Bajo]

David James <djames at collab.net> wrote:

>>> * contrib/client-side/svnmerge.py
>>>   (main): Don't reuse the same options for multiple runs of
>>>   svnmerge.main() within the test suite. Instead, re-initialize our
>>>   options from a clean copy of the options dictionary every time
>>> svnmerge.main() is called.
>>
>> You didn't say why it is needed. I thought I had made sure it wasn't
>> needed.
>
> Strictly speaking, we don't need to have a clean copy of the options
> dictionary for each run of svnmerge.main(). However, if we reuse the
> same options dictionary, then it is possible that a run of
> svnmerge.main() will accidentally reuse values from a previous run of
> svnmerge.

Ah yes sorry, I had misread your patch. It makes perfect sense and I'm actually
surprised we hadn't accidentally triggered this before in the testsuite. Many
thanks for the patch!

Giovanni Bajo