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

[TSVN] Feature request: Diffing revisions with working copy ....

From: Matt Doran <matt.doran_at_papercut.biz>
Date: 2005-08-10 02:51:40 CEST

Hi there,

A bit of background .... I recently wanted to revert part of a change to
a particular file in a previous commit. Because I didn't want to revert
all of the changes in the given file I could not use the built-in revert
functionality. So what I needed to do was diff a file between the
revision prior to the change and the working copy. Then I could use
Beyond Compare (the excellent diff tool) to assist reverting the changes.

I initially looked at the changes made in that revision, and without
thinking I started reverting changes ... but all I was doing was editing
the "svnXXX.tmp" files ... and I didn't realise until I'd already closed
the application. Maybe I should pay more attention!! :( .... which
leads to the first feature request ...

    FR1: Make the temp files generated for the diffs read-only. I
    don't think there's ever a reason to edit these files. If the user
    really want to edit them, they can modify the read-only flag. This
    way you can't accidently waste your time editing the files.

After I realised my mistake, I wanted to do a diff between my working
copy and the revision prior to the change, but found that there was no
menu option to diff a single file from a previous rev with the WC

    FR2: In the log window when you right-click on a file in a modified
    file from a previous revision, it would be good if you could diff
    this against the working copy. I guess in my case, I'd really want
    to diff the WC against the version of the file prior to the change
    (i.e REV-1) ... and I think this would be the common case.

Because I didn't have FR2, I tried to right-click the revision in
question and select "Compare with Working Copy". This opened the
multi-file diff tool which *almost* did what I required. But I'd like
to use Beyond Compare instead of the built-in diff tool. I have my
external diff tool set to Beyond Compare, but it still used the built-in
tool.

    FR3: Would it be possible to make the revision diff functionality
    use the external diff tool? It would mean still popping up the list
    of changed files, but when double-clicking the file, it would use
    the external diff tool. This would be great.

Thanks again for the great tool!!!

Regards,
Matt
Received on Wed Aug 10 02:52:12 2005

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