Re: svn commit: r1740320 - in /subversion/trunk/subversion: include/svn_client.h libsvn_client/conflicts.c svn/conflict-callbacks.c tests/libsvn_client/conflicts-test.c

On Thu, Apr 21, 2016 at 07:37:50PM +0300, Ivan Zhakov wrote:
> On 21 April 2016 at 17:34, Stefan Sperling <stsp_at_apache.org> wrote:
> > Implementation aside, I do think the option to merge the two directories
> > makes sense, even if they are ancestrally unrelated.
> May there are some implementation problems, but I think merging two
> directories makes sense: it's real world case during some refactoring.

Yes, it makes sense, as I already stated (did you read "don't" where
I wrote "do"?)

But the implementation should work.
Any idea how can we can avoid the problems I have described?
Received on 2016-04-21 18:44:23 CEST