Index: svn/Merger.cls.xml
===================================================================
diff -u -r1783 -r1792
--- svn/Merger.cls.xml	(.../Merger.cls.xml)	(revision 1783)
+++ svn/Merger.cls.xml	(.../Merger.cls.xml)	(revision 1792)
@@ -3,11 +3,27 @@
 <Class name="svn.Merger">
 <Super>svn.RegisteredObject</Super>
 
+<Property name="Console">
+<Type>TECH.Console.Console</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="ErrorMessages">
 <Type>%String</Type>
 <Private>1</Private>
 </Property>
 
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..Console = ##class(TECH.Context).Instance().GeefConsoleAPI()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="StartMerge">
 <FormalSpec>RevisionRange:%String,From:%String="trunk2010",To:%String="deploy2010"</FormalSpec>
 <Implementation><![CDATA[
@@ -17,7 +33,7 @@
 	set Iterator = ##class(TECH.ListIterator).%New(##class(TECH.ListUtils).CompositeRangeStringToList(RevisionRange))
 	while Iterator.HasNext() {
 		#dim Revision As %String = Iterator.Next()
-		write !,Revision
+		do ..Console.Write($$$CRLF_Revision)		
 		do ..ExecMerge(Revision,From,To)	
 	}
 	
@@ -55,7 +71,7 @@
 	do:$$$Not(..AbortMerge()) ..svnStatus(To)
 	do:$$$Not(..AbortMerge()) ..svnCommit(Revision,From,To)
 	
-	write:..AbortMerge() !!!,..ErrorMessages
+	do:..AbortMerge() ..Console.Write($$$CRLF_$$$CRLF_$$$CRLF_..ErrorMessages)
 ]]></Implementation>
 </Method>
 
@@ -70,7 +86,7 @@
 <FormalSpec>To:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	write !,"Getting Status"
+	do ..Console.Write("Getting Status")
 	set svnCommand = ##class(svn.Command).%New("")
 	set svnCommand.LocalWorkspace = "E:\svn\CacheAdminA\"_To
 	set svnCommand.SubCommand = "status"
@@ -79,7 +95,7 @@
 	set It = ##class(TECH.ListIterator).%New(svnCommand.Results)
 	while It.HasNext() {
 		#dim CommandResult As svn.CommandResult = It.Next()
-		if CommandResult.Action = "!" set ..ErrorMessages = "Conflict on "_CommandResult.ExternalName
+		if ##class(TECH.StringUtils).Equals(CommandResult.Action,"!","?") set ..ErrorMessages = "Conflict on "_CommandResult.ExternalName
 	}
 ]]></Implementation>
 </Method>
@@ -88,7 +104,7 @@
 <FormalSpec>Revision:%String,From:%String,To:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	write !,"Commit"
+	do ..Console.Write("Commit")
 	set svnCommand = ##class(svn.Command).%New("")
 	set svnCommand.LocalWorkspace = "E:\svn\CacheAdminA\"_To
 	set svnCommand.SubCommand = "commit"
@@ -103,7 +119,7 @@
 <FormalSpec>Revision:%String,From:%String,To:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	write !,"Merge"
+	do ..Console.Write("Merge")
 	set svnCommand = ##class(svn.Command).%New("")
 	set svnCommand.LocalWorkspace = "E:\svn\CacheAdminA\"_To
 	set svnCommand.Repository = "http://subversion:81/svn/CacheAdminA/trunk2010"
@@ -117,7 +133,7 @@
 <Method name="svnUpdate">
 <FormalSpec>To:%String</FormalSpec>
 <Implementation><![CDATA[
-	write !,"Update"
+	do ..Console.Write("Update")
 	set svnCommand = ##class(svn.Command).%New("")
 	set svnCommand.LocalWorkspace = "E:\svn\CacheAdminA\"_To
 	set svnCommand.SubCommand = "update"
@@ -143,7 +159,7 @@
 	#dim Result As %String = ""
 	#dim LineCounter As %Integer
 	for LineCounter = 1 : 1 : 3 do svnCommand.Result.ReadLine()
-	while 'svnCommand.Result.AtEnd {
+	while $$$Not(svnCommand.Result.AtEnd) {
 		#dim Line As %String = svnCommand.Result.ReadLine()
 		set:$$$Not($$$StartsWith(Line,"----")) Result = Result _ Line _ " "
 	}