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

Odd diff problem with replaced files

From: Gavin Lambert <colnet_at_mirality.co.nz>
Date: Wed, 3 Jun 2015 16:42:22 -0700 (PDT)

Using TSVN 1.8.7, I encountered the following odd problem:

1. Right-click-dragged "SVN Copy versioned files" some items from a working copy on one branch to a working copy on another branch. (And yes, the copy was intended, I don't want to merge.)

2. Check for modifications.

 a. SVN status for the files is now showing as "replaced (+)", as expected.

 b. Double-click on the file shows no differences. (This seems wrong.)

 c. "Show Log" is showing the history of the source file, not the history of the target file. (This does make sense, but it did initially surprise me.)

 d. "Show differences as unified diff" shows the *real* diff between the current WC version of the file and the prior replaced file on the target branch (which is what I was expecting [b] to do, but didn't).

I suspect in this case I should probably have copied the file *without* SVN history to get the behaviour I wanted, but the difference between [b] and [d]'s behaviour puzzles me.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-06-04 01:42:30 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.