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

Re: External diffs and temp files

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Mon, 27 Dec 2010 22:21:40 +0200

If you want to derive the working file's path, it's in the -L arguments
(argv[3] and argv[5]). Mind the tabs.

I'd look into scripting something around :diffpatch in Vim: some custom
command you run while editing the file. In that case, you'll to reverse
the diff before applying it. (you can use a diff-cmd wrapper,
or the patchutils package, or patch -R, to do that)

Ruben Bibas wrote on Mon, Dec 27, 2010 at 17:20:18 +0100:
> Hello,
> I am working with subversion on a debian platform.
> I am trying to use either vimdiff or meld as a diff tool.
> So I created a script containing either /usr/bin/vimdiff $6 $7 or
> /usr/bin/meld $6 $7.
> Everything works fine except that $7 is actually a temp file, and when I
> am done changing the file, the tempfile is saved, but the actual working
> copy has not been modified.
> The only similar topic I could find was this one:
> http://stackoverflow.com/questions/396176/why-does-svn-diff-sometimes-copy-working-files-to-a-temp-file
> However, I don't have any keywords or any of the kind.
> Any kind of help would be greatly appreciated.
> Many thanks
> Ruben
Received on 2010-12-27 21:25:01 CET

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.