Changeset 93 for trunk/lingosource/castlib1/svn_Utilities.ls

Timestamp:

12/09/07 15:55:41 (4 years ago)

Author:

alex

Message:

various fixes in beta

File:

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

trunk/lingosource/castlib1/svn_Utilities.ls

@@ -138 +138 @@
           
           if count(theResult) > 0 then
-            put "No differences found for member: " & memref.name && "(" & memref & ")"
-            
+            if theResult[1] contains "no such file or directory" then
+              put theResult[1]
+            else
+              put "No differences found for member: " & memref.name && "(" & memref & ")"
+            end if
           else
             
             -------- now write the results of the BBEdit diff back into the script members
-            scrText = mGetTextFromTempFile(me, tempSrcHFSPath)
+            scrText = mGetTextFromFile(me, tempSrcHFSPath)
             
             
@@ -2963 +2966 @@
   
   if chooseNewPath = 1 then
-    workingFolder = baGetFolder(the moviepath, "Please select a working copy for SVN update", 3, "Select working copy", -2, -2)
+    workingFolder = mGetFolderPathFromUser(me, the moviepath, "Please select a working copy for SVN update", 3, "Select working copy", -2, -2)
   end if
   
@@ -2973 +2976 @@
     alert selectMsg
     
-    workingFolder = baGetFolder(the moviepath, "Please select a working copy for SVN update", 3, "Select working copy", -2, -2)
+    workingFolder = mGetFolderPathFromUser(me, the moviepath, "Please select a working copy for SVN update", 3, "Select working copy", -2, -2)
   end if