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

Re: Screenshot with problem

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 05 Aug 2009 15:30:30 +0200

On 05.08.2009 10:58, Igor Nesterov wrote:
> Stefan, I make a screenshot with diff problem. Folder test with single file named "a". File was added in 530 revision with single line contains "1". Second line contains "2" was added in 531 revision. Third line with "3" was added to the working copy.
> I called "Show Log" for folder (not file "a", but for entire folder!) and "Compare with working copy" was called for both 530 and 531 revision. You can see right comparison for r530 and totally wrong comparison for r531.

The problem I see here is that the function "compare with working copy"
actually creates a unified diff (i.e., a patch) which then TMerge
"applies" to the working copy to show you the diff. But the svn lib has
some problems with that diff if the file in the working copy is modified
(the pathfile is created agains the working BASE, so agains your working
copy *without* the local modifications). This leads to problems in
TMerge because it still tries to apply the patch to your locally
modified files (it can't apply them to the working BASE apparently).

Until the diff function in the svn lib also works with WC instead of
BASE, I'm afraid you have to live with that problem. Sorry.

But the whole diffing functions are currently rewritten, so this *might*
work a lot better once version 1.7 comes out.


   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 2009-08-05 15:31:00 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.