RE: svn commit: r1414810 - /subversion/trunk/subversion/libsvn_client/merge.c
From: Bert Huijben <bert_at_qqmail.nl>
Date: Wed, 28 Nov 2012 18:19:54 +0100
> -----Original Message-----
Are you sure the *editor drive ordering* is like that?
I'm pretty sure the add events are driven on the update report which is identical for all ra layers, while for serf the file and directory modifications may arrive later. It's just that the diff editor only reports the additions after close_file() and close_directory().
The result is the same, but we receive more information on the client, which we might use to avoid these problems...
And this brings us back on the question: should we really drive merges on the diff editor.
The v1 editor works, but it is not the ideal situation. And driving it on a v2 editor will be even harder as there are no clean open events to perform tree conflict tests.
This is an archived mail posted to the Subversion Dev mailing list.