Re: svn merge --reintegrate like diff

2016-10-01 Thread Alexey Neyman
On 09/28/2016 09:49 AM, Stefan Sperling wrote: On Tue, Sep 27, 2016 at 10:12:28AM -0700, Alexey Neyman wrote: On 09/27/2016 01:46 AM, Daniel Shahaf wrote: Johan Corveleyn wrote on Mon, Sep 26, 2016 at 13:04:04 +0200: Maybe I'm missing something, but I don't understand why 'svn diff --old=TRUNK

Re: svn merge --reintegrate like diff

2016-10-01 Thread Stefan Sperling
On Sat, Oct 01, 2016 at 10:19:34PM -0700, Alexey Neyman wrote: > On 09/28/2016 09:49 AM, Stefan Sperling wrote: > > Hi Alexey, > > > > Could you compile an SVN client from trunk and try some merges with it, > > and let me know how the merging of moves with the new conflict resolver > > (which is s