SteveKing <steveking@gmx.ch> wrote:
>Oh, you mean the files generated in a conflict!
>You have to complain on the subversion mailing list about that - it's
>the SVN library which creates these files, not TSVN.
>
>Stefan
Err, no. I mean:
1. Right click on the trunk
2. Show log
3. In the three pane window, select any change in the top pane. In the bottom
pane, right click on any file (lets say file.txt) and select "Show differences"
4. Tortoise creates two files in my temp directory (svn41A.tmp and svn41B.tmp in
this case), and then invokes custom diff program (Beyond Compare in my case)
with these two files as parameters.
Note that in the process, the original .txt extension got converted to generic
.tmp extension (don't care about file name at this point). So, if file I want to
diff is .dll, or .jpg, or .c, or .java, or ... they all become .tmp when passed
to the diff program. Beyond Compare (as some other diff programs) offer
contextual diff's based on the "file type" (a.k.a. file extension). That is
impossible if all files are of .tmp "type".
I'm sure you are aware of all these facts, it just that we were not connecting
in previous posts. My suggestions is that, in this example, file.txt for diff
gets names of svn41A-file.txt and svn41B-file.txt instead of svn41A.tmp and
svn41B.tmp. Or something similar, where file type (and maybe even original file
name) is preserved.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Aug 5 20:57:19 2004