[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: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Sat, 6 Dec 2008 21:49:01 +0200 (Jerusalem Standard Time)

Steven Woody wrote on Sat, 6 Dec 2008 at 13:44 +0800:
> On Sat, Dec 6, 2008 at 5:04 AM, Ryan Schmidt
> <subversion-2008c_at_ryandesign.com> wrote:
> > When you want to look at a diff, you don't want to see a line for each
> > keyword that got expanded, so Subversion creates a temporary copy of your
> > working file and unexpands the keywords in it so that it can show a clean
> > diff against the pristine copy.
>
> Ok, thank you. It now sounds reasonable. I am thinking that is there
> another vim user get similar requirement like me, I still want to
> directly edit my working copy ... :)
>

You should be able to build something around :diffpatch, e.g.

    :!svn diff % > tmpfile
    :diffpatch tmpfile

However, personally, I keep a window open on the 'svn diff' output (which
I leave as the default unidiff), and wrote a command[1] that refreshes it
(after I've made changes and want to see the new diff).

HTH,

Daniel

[1] the :SvnRediff command, in
    http://article.gmane.org/gmane.comp.version-control.subversion.devel/105397

> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980450
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
>

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980579

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2008-12-08 23:33:54 CET

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