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

Re: Diff doesn't work with single file externals?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 14 Aug 2013 21:57:59 +0200

On 12.08.2013 20:40, Steve Strobel wrote:
> I just tried out single file externals for the first time, using
> TortoiseSVN 1.8.1. I created a new directory in my repo, set up the
> externals property to pull in some existing source files, and checked
> out a working copy of the directory. It got populated with the files,
> just as I expected. I then modified some of the files, which caused
> their icons to change in Windows Explorer; so far so good.
> I then did an SVN diff and it showed the working base as a _blank_ file
> on the left, my edited file on the right. I think it should have
> instead shown the original (non-blank) file on the left. I tried to get
> the desired diff display another way by starting a commit, then
> double-clicking on the changed files in the list, but got the same result.
>
> However, when I created a patch file, it correctly showed only the lines
> I edited. So I think it has all of the correct information, but has
> trouble finding the working base copy when setting up the diff view.
> Any idea how to fix that?
>
> I tried it with the diff viewer set to WinMerge then TortoiseMerge with
> the same results. If I set up a working copy with a directory included
> through an svn:externals property, the diff view works fine there. So
> the problem seems to be related to doing single file externals.

Created issue #535 for this:
http://code.google.com/p/tortoisesvn/issues/detail?id=535

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=3062643
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-08-14 21:58:10 CEST

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