On 21/03/13 15:05, Julian Foad wrote: > - Does Subversion provide good labels? I have been using > 'diff3-cmd' configured to run kdiff3, and the labels Subversion passes > to it are like '.mine', '.r1459015' and '.r1459080' -- they don't > include the file name at all, which makes it very hard to see what > file I'm being asked to merge. (Maybe the diff3-cmd option was > never designed to run a GUI diff tool? But I do it.) And for > 'merge-tool-cmd' it doesn't appear to pass any labels at the moment. > What a lot of inconsistency to sort out. But if the labels passed > to the diff-cmd are always good, you don't worry about this yet.
Thank you for the well-thought-out response. It cleared up some misconceptions, and yes, I did think of merge there. :) I have to think about your letter in detail a little more before I can say anymore. Gabriela ps.: I think that the issue with kdiff3 is with the label handling. The section below suggests to me that kdiff3 is dropping some info from the label it has been passed: <quote> g_at_musashi:~/tmp/test-wc$ $SVN diff --diff-cmd=/home/g/programming/perlfiles/dump_diff.pl Index: testfile =================================================================== Dumping @ARGV... Arg 0 is >-u< Arg 1 is >-L< Arg 2 is >testfile (revision 1)< Arg 3 is >-L< Arg 4 is >testfile (working copy)< Arg 5 is >/home/g/tmp/test-wc/.svn/pristine/91/91b7b0b1e27bfbf7bc646946f35fa972c47c2d32.svn-base< Arg 6 is >/home/g/tmp/test-wc/testfile< g_at_musashi:~/tmp/test-wc$ </quote>
