Index: svn/Command.cls.xml
===================================================================
diff -u -r1649 -r1685
--- svn/Command.cls.xml	(.../Command.cls.xml)	(revision 1649)
+++ svn/Command.cls.xml	(.../Command.cls.xml)	(revision 1685)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="24">
 <Class name="svn.Command">
 <IncludeCode>svn,%occErrors,%sySite</IncludeCode>
-<Super>%Persistent</Super>
+<Super>%RegisteredObject</Super>
 
 <Parameter name="PRODUCT">
 <Description>
@@ -155,9 +155,9 @@
 	//#dim ex as %Exception.AbstractException
 	
 	for ii=0,1 set tCmd(ii)=$s($$$ISWINDOWS:"cmd /C ",$$$ISUNIX:"bash -c ",1:"?")
-	set:..File="..xml" ..File="" set tSC=..%Save()
+	set:..File="..xml" ..File="" ;set tSC=..%Save()
 	
-	if ..File = "" set ..File = ..LocalWorkspace set tSC=..%Save()
+	if ..File = "" set ..File = ..LocalWorkspace ;set tSC=..%Save()
 	
 	// +DK 2.16
 	// this is windows only commands concatenation
@@ -338,12 +338,11 @@
 			set tResult.Action = $e(pLine,4)
 		}
 	} else {
-		
 		// TODO
 	}
 	set tResult.Action = $translate(tResult.Action," ","") 
 	set tResult.Command=##this
-	set tSC=tResult.%Save()
+	;set tSC=tResult.%Save()
 	
 	quit tSC
 ]]></Implementation>
Index: svn/StudioHook.cls.xml
===================================================================
diff -u -r1682 -r1685
--- svn/StudioHook.cls.xml	(.../StudioHook.cls.xml)	(revision 1682)
+++ svn/StudioHook.cls.xml	(.../StudioHook.cls.xml)	(revision 1685)
@@ -616,7 +616,7 @@
 		} elseif tMenu="sync" {
 			// Do nothing
 		} elseif tMenu="branch" {
-			set tCmd=##class(svn.Command).RowIdOpen(..Cmd)
+			set tCmd=##class(svn.Command).%New()
 			if Answer=1 {
 				if tCmd'=$$$NULLOREF { 
 					do tCmd.Execute()
@@ -711,17 +711,11 @@
 			set ^SYS("SourceControl",$$$PRODUCT,"Branch")="trunk"
 		} else {
 			// ALL OTHER COMMANDS
-			set tCmd=##class(svn.Command).RowIdOpen(..Cmd)
-			if tCmd=$$$NULLOREF {
-				write !," *** Studio: can't open Command record with GUID "_..Cmd_ " ! ***"	
-			} elseif tCmd.SubCommand="" {
-				// do nothing - this deals with Settings form.
-			} else {
-				if Answer=1 {
-					if tCmd.SubCommand="add" do ..svnHelper.ExportCode(InternalName)
-					do tCmd.Execute()
-					Set ..IsDisconnected =..svnHelper.PostProcessing(tCmd)
-				}
+			if Answer=1 {
+				set tCmd=##class(svn.Command).%New()
+				if tCmd.SubCommand="add" do ..svnHelper.ExportCode(InternalName)
+				do tCmd.Execute()
+				Set ..IsDisconnected =..svnHelper.PostProcessing(tCmd)
 			}
 		}
 	} catch (ex) {