Re: svn merge --reintegrate like diff

2016-10-03 Thread Stefan Sperling
On Sun, Oct 02, 2016 at 12:16:27PM -0700, Alexey Neyman wrote: > On 10/01/2016 10:59 PM, Stefan Sperling wrote: > > 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

Re: svn merge --reintegrate like diff

2016-10-02 Thread Alexey Neyman
On 10/01/2016 10:59 PM, Stefan Sperling wrote: 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

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

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-09-28 Thread Stefan Sperling
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 --new=BRANCH' would show you thin

Re: svn merge --reintegrate like diff

2016-09-27 Thread Alexey Neyman
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 --new=BRANCH' would show you things that you previously merged from TRUNK to BRANCH. It should show exactly the

Re: Re: svn merge --reintegrate like diff

2016-09-27 Thread Daniel Shahaf
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 --new=BRANCH' would show you things that you previously > merged from TRUNK to BRANCH. It should show exactly the content-wise > difference between TRUNK a

Re: Re: svn merge --reintegrate like diff

2016-09-26 Thread Johan Corveleyn
On Mon, Sep 26, 2016 at 10:30 AM, Veit Guna wrote: >> Gesendet: Montag, 26. September 2016 um 09:59 Uhr >> Von: "Johan Corveleyn" >> An: "Daniel Shahaf" >> Cc: "Veit Guna" , "users@subversion.apache.org" >> >> Betref

Re: svn merge --reintegrate like diff

2016-09-26 Thread Johan Corveleyn
On Sat, Sep 24, 2016 at 12:44 PM, Daniel Shahaf wrote: > Veit Guna wrote on Sat, Sep 24, 2016 at 12:19:16 +0200: >> So basically what I need is a diff that shows me the same changes that >> would be made to trunk if the branch >> would be merged to it (ignoring trunk changes merged to branch). >>

Re: svn merge --reintegrate like diff

2016-09-24 Thread Daniel Shahaf
Veit Guna wrote on Sat, Sep 24, 2016 at 12:19:16 +0200: > So basically what I need is a diff that shows me the same changes that > would be made to trunk if the branch > would be merged to it (ignoring trunk changes merged to branch). > > Is this somehow possible? Checkout trunk@HEAD, run 'merge