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

From: *Stefan Küng* <tortoisesvn_at_gmail.com>

> Date: Wed, Aug 14, 2013 at 1:57 PM
> To: users_at_tortoisesvn.tigris.org
>
>
> 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
>

Thanks for the fast help. This fix worked great for us, however, now we are
having some similar issues with files in a different situation. I apologies
for the attached screen shot but I doubt my ability to describe the problem
very well without it. There is descriptive text embedded in the image.

Using Tortoise SVN 1.8.2.

Thanks for your help,
-TuckerD

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3064102

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].