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

Re: Re: Latest Win32 binaries

From: Kevin Pilch-Bisson <kevin_at_pilch-bisson.net>
Date: 2001-10-11 22:51:11 CEST

On Thu, Oct 11, 2001 at 11:27:16AM -0700, Mike Geiger wrote:
> In "svn_private_config.h" there is a define:
> #define SVN_CLIENT_DIFF "c:\\progra~1\\cygnus\\cygwin\\bin\\diff.exe"
>
> that shows which diff program to use. I have set up and used
> #define SVN_CLIENT_DIFF "C:\\Program Files\\Microsoft Visual
> Studio\\Common\\Tools\\WINDIFF.EXE"
>
> as well. To do this you have to change the following line in diff.c:
> if (options->nelts == 0)
> args[i++] = "-u";
> to something like:
> if (options->nelts == 0)
> args[i] = "";
>
> Otherwise, "-u" becomes the first parameter to the diff program, which
> causes windiff.exe to show a 'help' dialog.
> It would be nice if this could be parameterized in an ini file and/or
> the command line.
It is planned to have a config file that will let you do this in the future.
For now we merely put in the -u since most svn developers use unidiffs, and
it saves them typing svn diff -x -u.

You could try svn diff -x '' (or the windows equivalent of making a null word),
and see if that will work without needing to patch the code.
>
> --Mike
>
> -----Original Message-----
> From: Ben Collins-Sussman [mailto:sussman@collab.net]
> Sent: Thursday, October 11, 2001 11:01 AM
> To: Branko Cibej
> Cc: dev@subversion.tigris.org
> Subject: Re: Latest Win32 binaries
>
>
> Branko =?ISO-8859-2?Q?=C8ibej?= <brane@xbc.nu> writes:
>
> > Well, as long as you don't have any local mods that would have to be
> > merged with changes from the repo, diff and patch never get used.
>
> Are you sure?
>
> I mean, when a file gets updated, it first "materializes" in the tmp/
> area by means of applying svndiff data to the pristine file.
>
> I then believe that 'diff' is run between the pristine file and the
> newly materialized file, and this difference is applied to the working
> file via 'patch'. I think this happens every single time.
>
> [Hmmm, if this *is* true, it's not efficient. If the file isn't
> locally modified, then the newly materialized file should just be
> copied over both the pristine and working files. I should go check.]
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>

-- 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Kevin Pilch-Bisson                    http://www.pilch-bisson.net
     "Historically speaking, the presences of wheels in Unix
     has never precluded their reinvention." - Larry Wall
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

  • application/pgp-signature attachment: stored
Received on Sat Oct 21 14:36:44 2006

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