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

svn diff and keywords

From: Marcus Rueckert <darix_at_web.de>
Date: 2005-11-01 17:58:00 CET

hi,

[[[
$ 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
]]]

the resulting chunk will look like that:

[[[
Index: kservicegroup.cpp
===================================================================
--- kservicegroup.cpp (.../tags/KDE/3.4.92/kdelibs/kio/kio/kservicegroup.cpp) (revision 476607)
+++ kservicegroup.cpp (.../branches/KDE/3.5/kdelibs/kio/kio/kservicegroup.cpp) (revision 476607)
@@ -16,8 +16,6 @@
  * Boston, MA 02110-1301, USA.
  **/

-// $Id$
-
 #include <kiconloader.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
]]]

Stephan Kulow from the kde team asked if it possible to get diffs with expanded
keywords. This patch doesnt apply cleanly against tarballs. This time it is
just one hunk, which needs to be fixed.

Would it be ok to add an option that tells diff to expand the keywords? Is it
possible at all?

with kind regards

    darix

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 1 17:58:44 2005

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