Index: svn/Repository.cls.xml
===================================================================
diff -u -r1710 -r1713
--- svn/Repository.cls.xml	(.../Repository.cls.xml)	(revision 1710)
+++ svn/Repository.cls.xml	(.../Repository.cls.xml)	(revision 1713)
@@ -56,7 +56,7 @@
 <Method name="CheckOut">
 <FormalSpec>Revision:%String=""</FormalSpec>
 <Implementation><![CDATA[
-	if ..AutoRevert do ..Revert()
+	if ..AutoRevert do ..UndoChanges()
 	
 	set tCmd=##class(svn.Command).%New($lb(..WorkspacePath(..Branch)))
 	set tCmd.SubCommand="update"
@@ -71,19 +71,46 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Revert">
+<Method name="UndoChanges">
+<Private>1</Private>
 <Implementation><![CDATA[
-	Set SvnHelper = ##class(svn.Helper).%New()
-	Do SvnHelper.CleanUp(..WorkspacePath(..Branch))
-	Do SvnHelper.RemoveUnversioned(..WorkspacePath(..Branch))
+	Set UnversionedPaths = ##class(%ListOfDataTypes).%New()
+	#dim IsRevertNeeded As %Boolean = $$$False
 	
 	set tCmd=##class(svn.Command).%New($lb(..WorkspacePath(..Branch)))
-	set tCmd.SubCommand="revert"
-	do tCmd.Options.SetAt("","-R")
+	set tCmd.SubCommand="status"
 	set tCmd.Reload = 1
 	set tCmd.File=..WorkspacePath(..Branch)
 	do tCmd.Execute()
-	Do ..VerwerkResultaat(tCmd)
+	Set ResultIt = ##class(TECH.ListIterator).%New(tCmd.Results)
+	While ResultIt.HasNext() {
+		#dim CommandResult As svn.CommandResult	= ResultIt.Next()
+		If (CommandResult.Action = "?") {
+			Do UnversionedPaths.Insert(CommandResult.ExternalName)
+		} ElseIf (CommandResult.Action = "A") {
+			Do UnversionedPaths.Insert(CommandResult.ExternalName)
+			Set IsRevertNeeded = $$$True
+		} Else {
+			Set IsRevertNeeded = $$$True
+		}
+	}
+	
+	If IsRevertNeeded {
+		set tCmd=##class(svn.Command).%New($lb(..WorkspacePath(..Branch)))
+		set tCmd.SubCommand="revert"
+		do tCmd.Options.SetAt("","-R")
+		set tCmd.Reload = 1
+		set tCmd.File=..WorkspacePath(..Branch)
+		do tCmd.Execute()
+		Do ..VerwerkResultaat(tCmd)
+	}
+	
+	Set UnversionedPathsIt = ##class(TECH.ListIterator).%New(UnversionedPaths)
+	While UnversionedPathsIt.HasNext() {
+		#dim UnversionedPath As TECH.String = UnversionedPathsIt.Next()
+		If ##class(TECH.File).DirectoryExists(UnversionedPath)  Do ##class(TECH.Context).Instance().GeefFileAPI().GeefDirectoryUtils().Delete(UnversionedPath)
+		Else  Do ##class(TECH.File).Delete(UnversionedPath)
+	}
 ]]></Implementation>
 </Method>
 
Index: svn/Helper.cls.xml
===================================================================
diff -u -r1712 -r1713
--- svn/Helper.cls.xml	(.../Helper.cls.xml)	(revision 1712)
+++ svn/Helper.cls.xml	(.../Helper.cls.xml)	(revision 1713)
@@ -721,26 +721,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="RemoveUnversioned">
-<FormalSpec>Path:TECH.String</FormalSpec>
-<Implementation><![CDATA[
-	set tCmd=##class(svn.Command).%New($lb(Path))
-	set tCmd.SubCommand="status"
-	set tCmd.Reload = 1
-	set tCmd.File=Path
-	do tCmd.Execute()
-	Set ResultIt = ##class(TECH.ListIterator).%New(tCmd.Results)
-	While ResultIt.HasNext() {
-		#dim CommandResult As svn.CommandResult	= ResultIt.Next()
-		If CommandResult.Action = "?" {
-			#dim UnversionedPath As TECH.String = CommandResult.ExternalName
-			If ##class(TECH.File).DirectoryExists(UnversionedPath)  Do ##class(TECH.Context).Instance().GeefFileAPI().GeefDirectoryUtils().Delete(UnversionedPath)
-			Else  Do ##class(TECH.File).Delete(UnversionedPath)
-		}
-	}
-]]></Implementation>
-</Method>
-
 <Method name="CleanUp">
 <FormalSpec>Path:TECH.String</FormalSpec>
 <Implementation><![CDATA[