[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 11 Sep 2013 19:36:05 +0200

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).

> 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.

> I tried updating my working to revision 4543 (where the replacements
> were made), and then right-clicked on the file in question. Choosing
> "Diff with previous version..." just gives an error message:
> [Window Title]
> TortoiseSVN
> [Main Instruction]
> Subversion reported an error:
> [Content]
> Unable to find repository location for
> 'working/copy/path/here' in revision 4542
> [Close]

That's another issue which has been discussed here before (has to do
with how peg revisions work and that svn does not store copy info
forwards, only backwards, i.e. where a file was copied from but not
where a file was copied to).


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-11 19:36:16 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.