[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 14:34:02 +0200

Hi,

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

> Hi,
>
> my branch has grown into a veritable forest, and so, I thought that
> it would be convenient to present the net code changes in a file called
> 'entire-branch-code' (attached).
>
> This is generated like so:
>
> 1) Merge trunk to branch
>
> 2) run this bash command:
>
> svn log --stop-on-copy | grep '^*\ subversion' |\
> awk '{gsub(/^ +| +$/,"")} {print $0}' | cut -d '*' -f 2 |\
> sort --unique | while read line; do echo $line | if [ -a $line ];\
> then echo ""; echo \
> "=============================**==============================**
> =====================";\
> echo "";\
> diff -p --context=0 -b -B -w "$HOME/trunk/$line" "$PWD/$line"; fi;\
> done > entire-branch-code
>

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.

Lieven

> Is this useful? Can this be improved?
>
> thanks,
>
> Gabriela
>
Received on 2013-10-13 14:35:02 CEST

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