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

svn external diff with non-local file fails?

From: Jesse Barnum <wodev_at_360works.com>
Date: 2005-03-25 04:52:18 CET

I am pretty new to svn, so I apologize in advance if I am doing
something wrong, but I've searched this mailing list and google and
have not found an answer to my problem.

I have written a little shell wrapper, as many people have suggested,
to pass diff arguments to my preferred diff utility (FileMerge on OS

As long as I'm doing a diff against the base version in my own
repository, like this:

svn diff --diff-cmd /Users/jesse/.subversion/svndiff AdReqDetail.java

I get the 6th (.svn/text-base/AdReqDetail.java.svn-base) and 7th
(AdReqDetail.java) parameters with the two filenames, pass them off,
and everything is fine.

The problem is when I try to compare to a version on the server other
than the base version. For example, when I use this command:

svn diff --diff-cmd /Users/jesse/.subversion/svndiff -r78

The 6th parameter is now pulling from the tmp folder,
'.svn/tmp/text-base/AdReqDetail.java.svn-base', and the file does not
exist. FileMerge gives me an error because it can't read from the
non-existent file.

My expectation is that Subversion should copy the necessary revision
into that temp folder, and then call my diff utility. Is that how it is
intended to work?

This is with svn, version 1.1.3 (r12730), Compiled Jan 16 2005, 23:38:26
I am running on Mac OS X 10.3.8.

--Jesse Barnum, CEO, 360Works
http://www.360works.com (866) 662-9185
Try WooF, the only solution for linking WebObjects and FileMaker!

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 25 04:54:50 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.