FEDERICO PRADES ILLANES wrote on Fri, Sep 23, 2016 at 12:36:24 +0200:
> Steps to reproduce:
>
>1. Create a branch b1.
>2. Create an dummy file in b1, with svn:keywords.
>3. Don't use the svn:keywords on the file.
>4. Commit the changes to b1.
>5. Create a branch b2, from b1.
>
Hi.
Currently at work we're using git for SCM. Although coming from SVN and
having my doubts in the first place, I like it very much now.
Especially the Github style flow with PRs and reviewing makes sense.
Now in another project we're still using SVN. Here I would love to have
the same PR/review
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
