subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel Shahaf <...@daniel.shahaf.name>
Subject Re: svn merge --reintegrate like diff
Date Sat, 24 Sep 2016 10:44:41 GMT
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 --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

Mime
View raw message