danigb27 / tortoisesvn

Automatically exported from code.google.com/p/tortoisesvn
0 stars 0 forks source link

diffing file externals shows empty base #535

Closed GoogleCodeExporter closed 8 years ago

GoogleCodeExporter commented 8 years ago
Reported on the mailing list:
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=30624
93

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.

Original issue reported on code.google.com by tortoisesvn on 14 Aug 2013 at 7:56

GoogleCodeExporter commented 8 years ago
Seems that exporting a file external fails without an error.
We have to use the original BASE file for those diffs and not try to convert 
the file first.

Original comment by tortoisesvn on 14 Aug 2013 at 7:57

GoogleCodeExporter commented 8 years ago
This issue was closed by revision r24665.

Original comment by tortoisesvn on 14 Aug 2013 at 8:01

GoogleCodeExporter commented 8 years ago
This issue was closed by revision r24667.

Original comment by tortoisesvn on 14 Aug 2013 at 8:19