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

Re: Tortoise Revert issue

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 15 Jan 2009 21:32:46 +0100

golan davidovits wrote:
> (1) In my example i did the revert by standing on the working copy
> top level folder and calling log from there. The reverted element was
> a folder inside the structure. Like i mentioned, the merge itself
> worked ok (as shown by using external folders diff tool) but the
> result of comparing latest-1 to working copy inside (by selecting
> compare to working copy from log) shown this strange result.

Comparing a revision to the working copy is actually done by comparing
the revision to the working BASE (that's a limitation of the svn
library, I *think* it's fixed in the nightly builds).

Also, the compare is done by creating a unified diff first, then
applying that 'patch' file to the working copy. That's why a 'compare
with working copy' from the log dialog always uses TortoiseMerge, even
if you have configured a different diff tool to use.

Not much we can do to prevent this from happening, especially for
renames/moves...

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1027016
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-01-15 21:34:42 CET

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