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

Re: Is there a way to see a diff of a "replaced" file?

From: Ben Fritz <fritzophrenic_at_gmail.com>
Date: Wed, 11 Sep 2013 15:09:59 -0500

On Wed, Sep 11, 2013 at 12:36 PM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> On 10.09.2013 17:49, Ben Fritz wrote:
>> On Mon, Sep 9, 2013 at 1:30 PM, Benjamin Fritz <fritzophrenic_at_gmail.com> wrote:
>>> I use "svn copy" to get files from tags of
>>> those various applications into this shared release directory.
>>> [snip]
>>> since the file shows as "Replaced" in the log, the diff goes back
>>> to the "copy from" address instead of the file at the current location
>>> (in the last revision). Normally, I want this. But in this case...is
>>> there a way to get a diff with the file that was replaced?
>> I asked this question also on the subversion users mailing list and
>> got the answer that this is the default behavior of 'svn diff':
>> http://article.gmane.org/gmane.comp.version-control.subversion.user/114864
>> I can confirm the command-line "svn diff" command lets me see the desired diff.
> To do the same in TSVN, you have to use "Show unified diff".
> If you use "Show Diff", then TSVN exports the file twice for each
> revision and starts the external diff tool (TMerge usually).

Well...I wanted a side-by-side compare. But "show unified diff" from
the log window actually DOES show the difference between the old file
and the file which replaced it. I'll start looking at this as a
workaround I suppose.

I guess my version of TSVN has a problem figuring out which file to
export or something for the left side.

>> But when I double-click on the file in TSVN's "show log" view, my diff
>> viewer pops up with two binary-identical files. I don't see any
>> alternate options in the context menu, or checkboxes, or settings to
>> NOT show the ancestry. So is it possible in TSVN to get the diff
>> ignoring ancestry like the default behavior of "svn diff" on the
>> command-line?
> Doing this with latest TSVN version (1.8.2): double click on file where
> at the revision where it got replaced shows the diff between the removed
> file and the newly added file, as expected.

Hmm, I guess I'll need to try again when I'm ready to upgrade. The
"show log" problems in 1.8.2 have convinced me to wait a bit longer,

How will I view the diff between the new version and the one it was
copied from, then?


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-11 22:10:25 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.