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

Re: svn diff and keywords

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: 2005-11-01 21:58:56 CET

Marcus Rueckert wrote:
> $ export R="svn://anonsvn.kde.org/home/kde"
> $ svn diff \
> --old $R/tags/KDE/3.4.92/kdelibs/kio/kio/kservicegroup.cpp \
> --new $R/branches/KDE/3.5/kdelibs/kio/kio/kservicegroup.cpp \
> > 3_5_BRANCH.diff
[...]
> Would it be ok to add an option that tells diff to expand the keywords? Is it
> possible at all?

In this case, where you want the diff between two exported files or trees, I
think you should export them and then use a regular (non-Subversion) "diff"
program:

   svn export $R/tags/KDE/3.4.92/kdelibs/kio/kio/kservicegroup.cpp d1/
   svn export $R/branches/KDE/3.5/kdelibs/kio/kio/kservicegroup.cpp d2/
   diff d1/ d2/ > 3_5_BRANCH.diff

This seems to be an obvious and simple solution, so I don't think we should
enhance "svn diff" to do this, though it is certainly possible to do so.

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 1 23:08:29 2005

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