Changeset 133 for trunk/lingosource

Timestamp:

02/05/08 16:38:57 (4 years ago)

Author:

alex

Message:

fixed support for tortoiseMerge

File:

• trunk/lingosource/castlib1/svn_Utilities.ls (modified) (3 diffs)

trunk/lingosource/castlib1/svn_Utilities.ls

@@ -138 +138 @@
             
             tmpfolder = baSysFolder("temp")
-            tempSrcHFSPath = tmpfolder & "temp_SVN_Diff_file1.ls"
-            
+            tempSrcPath = tmpfolder & "temp_SVN_Diff_file1.ls"
+            tempSrcHFSPath = tempSrcPath
           end if
           
@@ -148 +148 @@
           
           
+          
+          
           if isMac then
+            
             comm = mConvertHFS2Unix(me, thePath)
-            
             
             theResult = mDoShellCmd(me, bbdiffpath & " --ignore-curly-quotes --ignore-spaces --wait --resume " &QUOTE& tempSrcPath &QUOTE&&QUOTE& comm &QUOTE && "2>&1", RETURN, 0, 1)
@@ -253 +255 @@
           else
             
-            theResult = mDoShellCmd(me, QUOTE & bbdiffpath & QUOTE && QUOTE & tempSrcPath &QUOTE&&QUOTE& comm, RETURN, 0, 0, 0)
+            
+            theResult = mDoShellCmd(me, QUOTE & bbdiffpath & QUOTE && QUOTE & tempSrcPath &QUOTE&&QUOTE& thePath &QUOTE, RETURN, 0, 0, 0)
             
             -------- now write the results of the BBEdit diff back into the script members