Re: svn commit: r1687029 - /subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py

> Julian Foad wrote:
>> The following patch also appears to fix the bug -- all tests pass.
[...]

Bert Huijben wrote:
[...]
> The problem is that we mix recording of mergeinfo to keep the intermediate
> state… and the recording of the final conflict resolving result, by only
> updating the mergeinfo once… instead of actually doing something to resolve
> the conflict.

I don't quite follow, but maybe we don't need to discuss that further
in this thread. It would be a good topic to discuss and sort out in
another thread some time.

> Your patch makes the behavior change specific to add-add tree conflicts…
> That looks like a much better solution than blindly ignoring all tree
> conflict types as done in the previous patch.

OK, I committed my simplification in r1688258.

- Julian
Received on 2015-06-29 18:39:11 CEST