Re: svn commit: r1414810 - /subversion/trunk/subversion/libsvn_client/merge.c

On 11/28/2012 12:19 PM, Bert Huijben wrote:
>> Teach the dry-run merge logic to account for additional flavors of
>> ra_serf editor drive ordering violations (*sigh*). Specifically,
>> account for situations where the editor drive looks like so:
>>
>> add_dir("dir1")
>> add_dir("dir2")
>> add_file("dir1/file")
>
> Are you sure the *editor drive ordering* is like that?

Strictly speaking, I suppose it was more like:

   d1 = add_dir("dir1")
   d2 = add_dir("dir2")
   close_dir(d2)
   f1 = add_file("dir1/file")
   close_file(f1)
   close_dir(d1)

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

ESCOPE. Great question for a different thread -- knock yourself out, man! :-)

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Enterprise Cloud Development