tweak the git mergetool for recent changes to performOnServer...(re…

…cognizing an error)
dalehenrich · Oct 7, 2015 · 4b7fb7c · 4b7fb7c
1 parent 116dc8a
commit 4b7fb7c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/repository/Tode-GemStone-Server-Core.package/TDGitMergeOperation.class/instance/applyTo..st b/repository/Tode-GemStone-Server-Core.package/TDGitMergeOperation.class/instance/applyTo..st
@@ -1,7 +1,9 @@
 merge
 applyTo: aTDGitMerger
   self selectedSourceRaw
-    ifNil: [ aTDGitMerger gitTool gitrmIn: self baseDirectory with: ' -rf ' , self filePath ]
+    ifNil: [ 
+      (self baseDirectory fileExists: self filePath)
+        ifTrue: [ aTDGitMerger gitTool gitrmIn: self baseDirectory with: ' -rf ' , self filePath ] ]
     ifNotNil: [ :src | 
       self baseDirectory
         forceNewFileNamed: self filePath

diff --git a/repository/Tode-GemStone-Server-Core.package/TDGitMergeOperation.class/methodProperties.json b/repository/Tode-GemStone-Server-Core.package/TDGitMergeOperation.class/methodProperties.json
@@ -4,7 +4,7 @@
 	"instance" : {
 		"ancestor" : "dkh 01/24/2015 14:59",
 		"ancestor:" : "dkh 01/24/2015 14:59",
-		"applyTo:" : "dkh 09/07/2015 11:10",
+		"applyTo:" : "dkh 10/07/2015 10:12",
 		"baseDirectory" : "dkh 01/24/2015 14:54",
 		"baseDirectory:" : "dkh 01/24/2015 14:54",
 		"calculateStage" : "dkh 01/24/2015 21:38",

diff --git a/repository/Tode-GemStone-Server-Core.package/monticello.meta/version b/repository/Tode-GemStone-Server-Core.package/monticello.meta/version