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

Re: Edit working copy while see the 'diff'

From: David Weintraub <qazwart_at_gmail.com>
Date: Fri, 5 Dec 2008 09:24:56 -0500

I also use vimdiff as my diff program when I do a "svn diff" on files, and I
don't seem to have this issue. I can easily edit my current file (which
appears on the right hand side).
Here's my "diff" command:

#! /usr/bin/env perl

use strict;
use warnings;

my $DIFF = "/usr/local/bin/vimdiff";

my $parameters = $#ARGV;
my $file1 = $ARGV[$parameters - 1];
my $file2 = $ARGV[$parameters];
my $title1 = $ARGV[$parameters - 4];
my $title2 = $ARGV[$parameters - 2];

my $title = "$title1 - $title2";
$title =~ s/\t/ /g;
$title =~ s/ /\\ /g;
my $command = qq($DIFF -c "set titlestring=$title" "$file1" "$file2");
system qq($command);

The file on the left is a temporary file. The file on the right is the
actual file being compared.

David Weintraub
On Fri, Dec 5, 2008 at 8:08 AM, Steven Woody <narkewoody_at_gmail.com> wrote:
> Hi,
> My svn diff-cmd was set to use 'vim -d', it's great.  But I found
> subversion is creating troubles for me when I in the 'vim -d' window,
> checking the differences and want to do a little modification to my
> working copy.  You know, the $7 parameter the 'svn diff' command
> provided is actually a temporary file, which is a copy of my working
> copy not the real one. so in my 'vim -d''s right window, I can only
> edit/modify the fake copy.
> Is there a solution to the problem? Thanks in advance.
> -
> narke
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980080
> To unsubscribe from this discussion, e-mail: [
> users-unsubscribe_at_subversion.tigris.org].
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2008-12-05 16:20:41 CET

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