Re: Re: svn merge --reintegrate like diff

On Mon, Sep 26, 2016 at 10:30 AM, Veit Guna <Veit.Guna_at_gmx.de> wrote:
>> Gesendet: Montag, 26. September 2016 um 09:59 Uhr
>> Von: "Johan Corveleyn" <jcorvel_at_gmail.com>
>> An: "Daniel Shahaf" <d.s_at_daniel.shahaf.name>
>> Cc: "Veit Guna" <veit.guna_at_gmx.de>, "users_at_subversion.apache.org" <users_at_subversion.apache.org>
>> Betreff: Re: svn merge --reintegrate like diff
>>
>> On Sat, Sep 24, 2016 at 12:44 PM, Daniel Shahaf <d.s_at_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_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.
>>
>> 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
>>
> Hi Johan.
>
> That's what I've used in the past. But that showed trunk merges as well. Haven't tried the mentioned options though.
> Currently testing the suggested merge-to-trunk-and-diff approach. Looks promising...

Hi Veit,

[ Please remember to include the mailinglist when replying. ]

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 and BRANCH, so if some content was merged
from TRUNK to BRANCH, both should be identical on that point, and it
shouldn't show up in 'diff'. Except if you're talking about ignoring
certain content in a merge e.g. by using --record-only merges, or by
modifying the merge result during conflict resolution or something
like that ...

-- 
Johan