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

Re: svn diff doesn't include repository path of changed files

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-08-18 17:08:33 CEST

David Sitsky <sits@users.sourceforge.net> writes:

> I had a user, who had something like:
>
> project/dira/file1.java
> project/dira/file2.java
> project/dirb/file3.java
>
> He did a:
>
> cd project/dirb
> svn diff -uN > /tmp/review.txt

There are many things wrong here. First, this user must be either
using a very old svn ('svn diff' doesn't take a -u option!), or isn't
using subversion's built-in diff ability. The user might have a
run-time variable set that tells svn to use a 3rd-party "diff" program
instead.

The reason I say this is that 'svn diff's internal diff mechanism
*does* give the paths you want. Witness:

[sussman@kepler:~/projects/svn]$ echo "foo" >> subversion/clients/cmdline/diff-cmd.c

[sussman@kepler:~/projects/svn]$ svn status
M subversion/clients/cmdline/diff-cmd.c

[sussman@kepler:~/projects/svn]$ svn diff
Index: subversion/clients/cmdline/diff-cmd.c
===================================================================
--- subversion/clients/cmdline/diff-cmd.c (revision 6770)
+++ subversion/clients/cmdline/diff-cmd.c (working copy)
@@ -166,3 +166,4 @@
  
   return SVN_NO_ERROR;
 }
+foo

[sussman@kepler:~/projects/svn]$ svn diff subversion/clients/cmdline/diff-cmd.c
Index: subversion/clients/cmdline/diff-cmd.c
===================================================================
--- subversion/clients/cmdline/diff-cmd.c (revision 6770)
+++ subversion/clients/cmdline/diff-cmd.c (working copy)
@@ -166,3 +166,4 @@
  
   return SVN_NO_ERROR;
 }
+foo

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Aug 18 17:13:12 2003

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