eGit bug, trying to resolve "changed but not changed" files

4 files changed, 51 insertions, 47 deletions

diff --git a/plugins/org.eclipse.emf.compare.team.subversive/.checkstyle b/plugins/org.eclipse.emf.compare.team.subversive/.checkstyle
index 4b5918627..df32406ea 100644
--- a/plugins/org.eclipse.emf.compare.team.subversive/.checkstyle
+++ b/plugins/org.eclipse.emf.compare.team.subversive/.checkstyle
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true">
-    <local-check-config name="EMF Compare" location="/org.eclipse.emf.compare/codeStyle/EMFCompareCheckstyleConfiguration.xml" type="project" description="">
-        <additional-data name="protect-config-file" value="false"/>
-    </local-check-config>
-    <fileset name="tous" enabled="true" check-config-name="EMF Compare" local="true">
-        <file-match-pattern match-pattern="." include-pattern="true"/>
-    </fileset>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="EMF Compare" location="/org.eclipse.emf.compare/codeStyle/EMFCompareCheckstyleConfiguration.xml" type="project" description="">
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <local-check-config name="EMF Compare CS5" location="/org.eclipse.emf.compare/codeStyle/EMFCompareCheckstyle5Configuration.xml" type="project" description="Checkstyle 5.0 compatible">
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="EMF Compare CS5" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
 </fileset-config>
diff --git a/plugins/org.eclipse.emf.compare.team.subversive/.project b/plugins/org.eclipse.emf.compare.team.subversive/.project
index 6e2951dc5..522ffcf03 100644
--- a/plugins/org.eclipse.emf.compare.team.subversive/.project
+++ b/plugins/org.eclipse.emf.compare.team.subversive/.project
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.emf.compare.team.subversive</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.emf.compare.team.subversive</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>

+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>

+	</natures>

+</projectDescription>

diff --git a/plugins/org.eclipse.emf.compare.team.subversive/about.html b/plugins/org.eclipse.emf.compare.team.subversive/about.html
index 670d10856..670d10856 100755..100644
--- a/plugins/org.eclipse.emf.compare.team.subversive/about.html
+++ b/plugins/org.eclipse.emf.compare.team.subversive/about.html
diff --git a/plugins/org.eclipse.emf.compare.team.subversive/plugin.properties b/plugins/org.eclipse.emf.compare.team.subversive/plugin.properties
index 6f7866017..6f7866017 100755..100644
--- a/plugins/org.eclipse.emf.compare.team.subversive/plugin.properties
+++ b/plugins/org.eclipse.emf.compare.team.subversive/plugin.properties