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

Re: Presenting net code changes for a branch

From: Lieven Govaerts <lieven.govaerts_at_gmail.com>
Date: Sun, 13 Oct 2013 16:15:33 +0200

Hi Gabriela,

On Sun, Oct 13, 2013 at 3:52 PM, Gabriela Gibson
<gabriela.gibson_at_gmail.com>wrote:

> On 13/10/13 13:34, Lieven Govaerts wrote:
>
>>
>> Is this any different than running:
>> svn diff -x -pwb ^/subversion/trunk
>> ^/subversion/branches/invoke-**diff-cmd-feature
>> ?
>>
>> At this moment there is a large diff between trunk and your branch, but
>> that's because you haven't brought your branch up to date with trunk
>> yet. But once you do that, the diff between branches should represent
>> your additions on the branch.
>>
>>
> Hi Lieven,
>
> thank you for the tip, but it's not working for me currently. The trunk
> has been freshly merged into the branch, and your command shows me all the
> changes that have been merged from the trunk to the branch, but,
> interestingly so, none of the changes I've made to the branch.
>
>
The last time you updated the invoke-diff-cmd branch from trunk was in
rr1526487, you updated from trunk r1526439.

So if you compare your branch to trunk_at_1526439 you will get a diff file
with only your changes. No?
$ svn diff -x -pwb
^/subversion/trunk_at_1526439^/subversion/branches/invoke-diff-cmd-feature

Or if you want to limit to the subversion folder:
$ svn diff -x -pwb
^/subversion/trunk/subversion_at_1526439^/subversion/branches/invoke-diff-cmd-feature/subversion

Basically, comparing branches is a core feature of Subversion, so I'm
wondering what specifically do you want to achieve by comparing two local
working copies with diff that you can't do with 'svn diff'?

Lieven

The original diff file in the other post is my actual code (44k, oh dear)
> which is why I'm looking for a way of taming this into something that is
> presentable.
>
> Gabriela
>
> ps.: i made a mistake in the original bash code, it should read
> diff -p --context=0 "$HOME/trunk/$line" "$PWD/$line"; fi;\
>
Received on 2013-10-13 16:16:27 CEST

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