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

Re: diff3 error on WIndows

From: <victor.ott_at_q-dsl.de>
Date: 2003-01-24 14:20:36 CET

------ jostein@josander.netwrote: ------

 From page 69 in the Subversion book:
 
 Registry-based configuration options are parsed before their file-based
 counterparts, so are overridden by values found in the configuration
 files. In other words, configuration priority is granted in the
 following order on a Windows system:
   1. Command-line options
   2. The per-user INI files
   3. The pre-user Registry values
   4. The system-wide INI files
   5. The system-wide Registry values

Thanks, I didn't notice that. Imho it's still inconsistent to use registry values in addition to the rc/ini files, because this adds unnecessary diffs complexity compared to the main code trunk, but that doesn't hurt me much ;)

After trying for some days to get svn running in windows, besides the workaround of putting diff.exe diff3.exe into a c:/cygwin/bin/ directory (thanks to Roger Talkov, just before quitting this made me hope again!), I found another workaround: put the line
    diff3-has-program-arg = false
into the [helpers] section of one of the %ALLUSERSPROFILE%\Application Data\Subversion\config or %USERPROFILE%\Application Data\Subversion\config files.

[NOTE: the cygwin diff3.exe I have is up to date and knows the --diff-program=PROGRAM option.]

victor.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 14 02:13:27 2006

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