[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn merge --reintegrate like diff

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Sat, 24 Sep 2016 10:44:41 +0000

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_at_HEAD, run 'merge --reintegrate' (without committing the
result), and run 'diff'?

That'd give the most accurate answer possible, even if the branch has
received cherry-picking or subtree merges.

Cheers,

Daniel
Received on 2016-09-24 12:46:03 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.