On Sat, Sep 24, 2016 at 12:44 PM, Daniel Shahaf <d...@daniel.shahaf.name> 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). >> >> 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.
I would think that 'svn diff --old=$trunk --new=$branch' should also work pretty well. Perhaps experiment with some of the options like --no-diff-added, --no-diff-deleted, --ignore-properties, --show-copies-as-adds, --git, --patch-compatible, ... -- Johan
