[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 11:47:56 CET

------ brane@xbc.nu wrote: ------
 Karl Fogel wrote:
 
 It sounds like a bug in the diff3 installation? Not sure it's worth
 an Subversion issue, especially with Sander working on replacing the
 external diff calls anyway, but maybe a FAQ item is in order? If you
 and/or the reporters agree with this analysis, I'll whip one up...
 
 We /do/ have a config option for the location of diff, diff3 and whether
 or not diff3 accepts --diff-program. With a reasonably recent Cygwin,
 that last should be true, which in fact is the default on Windows.
 Please look in the following locations:
 
     %ALLUSERSPROFILE%\Application Data\Subversion\config
     %USERPROFILE%\Application Data\Subversion\config
 
 and in the Registry:
 
     HKEY_LOCAL_MACHINE\Software\Tigris.org\Subversion\Config
     HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config
 
 and tell us what's in the [helpers] section there. I'm 99% certain this
 is a configuration error.

* %ALLUSERSPROFILE%\Application Data\Subversion\config:
directory Subversion doesn't exist

* C:\Dokumente und Einstellungen\victor\Anwendungsdaten\Subversion\config:
+++
# [helpers]
# editor-cmd = editor (vi, emacs, notepad, etc.)
# diff-cmd = C:\Cygwin\bin\diff.exe
# diff3-cmd = C:\Cygwin\bin\diff3.exe
# diff3-has-program-arg = true
+++

* HKEY_LOCAL_MACHINE\Software\Tigris.org\Subversion\Config and
* HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config:
+++
diff3-cmd c:\programme\cygwin\bin\diff3.exe
diff-cmd c:\programme\cygwin\bin\diff.exe
+++

Two questions about this:
- why do two subversion config places exist in windows? (I'm
  against using the registry, because backup is ... difficult.
  or to be honest, when you backup your svn directory, do you
  really remember to backup the svn registry keys?)

- which entries have now priority: the registry entries or the
  config file? in which order? the same question for all_users
  vs current_user ...

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:13 2006

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