sky01126 / svnx

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

svndiff.sh script, about kdiff3 #151

Closed GoogleCodeExporter closed 8 years ago

GoogleCodeExporter commented 8 years ago
What steps will reproduce the problem?
What is the expected output? What do you see instead?

>> kdiff3 is not open problem.

What version of the product are you using? On what operating system?

>> OS :  Mac( OS X 10.6.x )
>> svnX Version : subversion repository version & 1.3.1

Please provide any additional information below.

>> look below a patch.
>> and please apply them. :-)

@@ -65,7 +67,7 @@
    "changes"       ) /usr/bin/chdiff "$file1" "$file2" ;;
    "guiffy"        ) DIFF='/usr/local/bin/guiffy'; if [ $isWorkingCopy ]
                        then "$DIFF" -m "$file1" "$file2" "$file2"; else "$DIFF" "$file1" "$file2"; fi ;;
-   "kdiff3"        ) ~/bin/kdiff3 "$file1" "$file2" &> /dev/null ;;
+   "kdiff3"        ) open -a kdiff3 --args "$file1" "$file2" &> /dev/null ;;
    "filemerge" | * ) DIFF='/usr/bin/opendiff'; if [ ! -x "$DIFF" ]; then DIFF="/Developer$DIFF"
                        if [ ! -x "$DIFF" ]; then DIFF='opendiff'; fi; fi
                        if [ $isWorkingCopy ]; then "$DIFF" "$file1" "$file2" -merge "$file2" &> /dev/null

Original issue reported on code.google.com by dh.j...@gmail.com on 30 Nov 2011 at 10:21

GoogleCodeExporter commented 8 years ago
Please open svnX’s Help window & read section “3.11. Diff”.

The `open` command does not accept `--args` on OSX 10.5, so your patch won’t 
work there.

Original comment by chris...@gmail.com on 30 Nov 2011 at 4:17

GoogleCodeExporter commented 8 years ago
Ok. thanks to rapidly reply.

Original comment by dh.j...@gmail.com on 1 Dec 2011 at 12:36

GoogleCodeExporter commented 8 years ago

Original comment by chris...@gmail.com on 1 Jan 2012 at 7:01