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

Re: Diff argument problem

From: Ryan Schmidt <subversion-2006q2_at_ryandesign.com>
Date: 2006-06-29 21:53:20 CEST

On Jun 29, 2006, at 19:18, Bruce Knoth wrote:

> I'm learning to use Subversion on WinXP. I setup
> WinMerge as an external diff program (I set "diff-cmd
> = C:\Program Files\WinMerge\WinMerge.exe" in the
> config file.)
> When I use the command line "svn diff ReadMe.txt" it
> appears to send the following command-line arguments
> to WinMerge (including the "(revision 3)" and
> "(working copy)" phrases:
> C:\Repositories\MedSys\ReadMe.txt (revision 3)
> C:\Repositories\MedSys\ReadMe.txt (working copy)
> The parenthetical expressions make them invalid file
> names, and the same name is being sent for both
> arguments.

When I set the --diff-cmd argument to the following Bash script on a
non-Windows system...

for ARG in "$@"; do
        echo '"'$ARG'"'

...I see the following arguments sent:

"path/to/file.txt (revision 1234)"
"path/to/file.txt (working copy)"

So WinMerge appears to be looking at arguments 3 and 5, when
arguments 6 and 7 are the ones that contain the actual filenames.

Looks to me like "-L" is supposed to indicate that the next argument
is a label, and not a filename.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jun 29 21:55:06 2006

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.