[487561] Fix missing conflict on resource uncontrol

When an ancestor resource contains diagrams controlled, and right and
left resources uncontrols those resources, a diff is detected. The
change introduced allow the MatchBasedConflictDetector to detect those
diffs as pseudo conflicts.

Bug: 487561
Change-Id: I9474f9f04fb1419f917456bf5b7b3b3c5bba2f0d
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>

19 files changed, 437 insertions, 0 deletions

diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/META-INF/MANIFEST.MF
index 263398099..b2d35efba 100644
--- a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/META-INF/MANIFEST.MF
@@ -12,5 +12,8 @@ Require-Bundle: org.eclipse.emf.compare.egit;bundle-version="1.1.0",
  org.eclipse.egit.core;bundle-version="4.1.0",
  org.eclipse.emf.compare.rcp.ui,
  org.eclipse.compare,
+ org.eclipse.papyrus.infra.core,
+ org.eclipse.papyrus.infra.gmfdiag.common,
+ org.eclipse.papyrus.uml.tools,
  org.eclipse.emf.compare.rcp
 Import-Package: org.eclipse.emf.compare.ide.ui.tests
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/MoveOfDiagramPseudoConflictDetection.java b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/MoveOfDiagramPseudoConflictDetection.java
new file mode 100644
index 000000000..843fe5d6d
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/MoveOfDiagramPseudoConflictDetection.java
@@ -0,0 +1,109 @@
+/*******************************************************************************
+ * Copyright (C) 2016 Obeo.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+package org.eclipse.emf.compare.diagram.papyrus.tests.conflicts.pseudoconflicts;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.compare.Comparison;
+import org.eclipse.emf.compare.Conflict;
+import org.eclipse.emf.compare.ConflictKind;
+import org.eclipse.emf.compare.diagram.papyrus.tests.resourceattachmentchange.move.AbstractResourceAttachmentChangeMoveTests;
+import org.eclipse.emf.compare.ide.ui.tests.workspace.TestProject;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.jgit.api.ResetCommand.ResetType;
+import org.junit.Test;
+
+@SuppressWarnings({"nls", "unused" })
+public class MoveOfDiagramPseudoConflictDetection extends AbstractResourceAttachmentChangeMoveTests {
+
+	/**
+	 * Path to the test data.
+	 */
+	private static String TEST_DATA_PATH = "src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/";
+
+	private ResourceSetImpl resourceSet;
+	private IProject iProject;
+	private TestProject testProject1;
+	private IFile modelDi;
+	private IFile modelNotation;
+	private IFile modelUml;
+	private IFile employeeDi;
+	private IFile employeeNotation;
+	private IFile employeeUml;
+	private IFile timeTrackingDi;
+	private IFile timeTrackingNotation;
+	private IFile timeTrackingUml;
+	
+	@Test
+	public void pseudoConflictsOnResourceRootTest() throws Exception {
+		setUpRepositoryMoveOfDiagrams();
+		repository.checkoutBranch(BRANCH_1);
+		Comparison comparison = compare(BRANCH_1, BRANCH_2, modelUml);
+		assertEquals(16, comparison.getDifferences().size());
+		assertEquals(4, comparison.getConflicts().size());
+		
+		for (Conflict conflict : comparison.getConflicts()) {
+			assertEquals(ConflictKind.PSEUDO, conflict.getKind());
+		}
+	}
+	
+	private void setUpRepositoryMoveOfDiagrams() throws Exception {
+		resourceSet = new ResourceSetImpl();
+		File workingDirectory = repository.getRepository().getWorkTree();
+		testProject1 = new TestProject("Project1", workingDirectory.getAbsolutePath());
+		iProject = testProject1.getProject();
+		repository.connect(iProject);
+		
+		// 1st commit: a model with two controlled packages. 
+		// The model and each packages contains a diagram
+		modelDi = addToProject(TEST_DATA_PATH, testProject1, iProject, "case001/commit1/model.di", "");
+		modelNotation = addToProject(TEST_DATA_PATH, testProject1, iProject, "case001/commit1/model.notation", "");
+		modelUml = addToProject(TEST_DATA_PATH, testProject1, iProject, "case001/commit1/model.uml", "");
+		employeeDi = addToProject(TEST_DATA_PATH, testProject1, iProject, "case001/commit1/Employee.di", "");
+		employeeNotation = addToProject(TEST_DATA_PATH, testProject1, iProject, "case001/commit1/Employee.notation", "");
+		employeeUml = addToProject(TEST_DATA_PATH, testProject1, iProject, "case001/commit1/Employee.uml", "");
+		timeTrackingDi = addToProject(TEST_DATA_PATH, testProject1, iProject, "case001/commit1/TimeTracking.di", "");
+		timeTrackingNotation = addToProject(TEST_DATA_PATH, testProject1, iProject, "case001/commit1/TimeTracking.notation", "");
+		timeTrackingUml = addToProject(TEST_DATA_PATH, testProject1, iProject, "case001/commit1/TimeTracking.uml", "");
+		repository.addAllAndCommit("1st-commit");
+		
+		// Create branchs.
+		repository.createBranch(MASTER, BRANCH_1);
+		repository.createBranch(MASTER, BRANCH_2);
+		
+		// 2nd commit: Uncontrol the packages. 
+		repository.checkoutBranch(BRANCH_1);
+		modelDi = addToProject(TEST_DATA_PATH, testProject1, iProject, "case001/commit2/model.di", "");
+		modelNotation = addToProject(TEST_DATA_PATH, testProject1, iProject, "case001/commit2/model.notation", "");
+		modelUml = addToProject(TEST_DATA_PATH, testProject1, iProject, "case001/commit2/model.uml", "");
+		removeFromProject(iProject, employeeDi.getName());
+		removeFromProject(iProject, employeeNotation.getName());
+		removeFromProject(iProject, employeeUml.getName());
+		removeFromProject(iProject, timeTrackingDi.getName());
+		removeFromProject(iProject, timeTrackingNotation.getName());
+		removeFromProject(iProject, timeTrackingUml.getName());
+		repository.addAllAndCommit("2nd-commit");
+		
+		// 3rd commit: small changes on the model from master. 
+		// The model have just a small change to make it different from master
+		repository.checkoutBranch(BRANCH_2);
+		modelDi = addToProject(TEST_DATA_PATH, testProject1, iProject, "case001/commit3/model.di", "");
+		modelNotation = addToProject(TEST_DATA_PATH, testProject1, iProject, "case001/commit3/model.notation", "");
+		modelUml = addToProject(TEST_DATA_PATH, testProject1, iProject, "case001/commit3/model.uml", "");
+		repository.addAllAndCommit("3rd-commit");
+		
+		repository.checkoutBranch(MASTER);
+	}
+	
+}
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/Employee.di b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/Employee.di
new file mode 100644
index 000000000..bf9abab34
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/Employee.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/Employee.notation b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/Employee.notation
new file mode 100644
index 000000000..8bf1ec385
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/Employee.notation
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_4Qrt4Fx_EeWmfY3-CYsIIw" type="PapyrusUMLComponentDiagram" name="Employee component" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_A1Pv8FyAEeWmfY3-CYsIIw" type="3205">
+    <children xmi:type="notation:DecorationNode" xmi:id="_A1Pv8lyAEeWmfY3-CYsIIw" type="5266"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_A1Pv81yAEeWmfY3-CYsIIw" type="6031">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_A1Pv9FyAEeWmfY3-CYsIIw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_A1QXAFyAEeWmfY3-CYsIIw" type="7008">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_A1QXAVyAEeWmfY3-CYsIIw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_A1QXAlyAEeWmfY3-CYsIIw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_A1QXA1yAEeWmfY3-CYsIIw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A1QXBFyAEeWmfY3-CYsIIw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_A1QXBVyAEeWmfY3-CYsIIw" type="7009">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_A1QXBlyAEeWmfY3-CYsIIw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_A1QXB1yAEeWmfY3-CYsIIw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_A1QXCFyAEeWmfY3-CYsIIw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A1QXCVyAEeWmfY3-CYsIIw"/>
+    </children>
+    <element xmi:type="uml:Interface" href="Employee.uml#_A1MFkFyAEeWmfY3-CYsIIw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A1Pv8VyAEeWmfY3-CYsIIw" x="416" y="47"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_4Qrt4Vx_EeWmfY3-CYsIIw" name="diagram_compatibility_version" stringValue="1.1.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_4Qrt4lx_EeWmfY3-CYsIIw"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_4Qrt41x_EeWmfY3-CYsIIw">
+    <owner xmi:type="uml:Package" href="Employee.uml#_lHCAoFeWEeWKEqTNFdy41w"/>
+  </styles>
+  <element xmi:type="uml:Package" href="Employee.uml#_lHCAoFeWEeWKEqTNFdy41w"/>
+</notation:Diagram>
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/Employee.uml b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/Employee.uml
new file mode 100644
index 000000000..909a0f357
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/Employee.uml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Package xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_lHCAoFeWEeWKEqTNFdy41w" name="Employee">
+  <packagedElement xmi:type="uml:Interface" xmi:id="_A1MFkFyAEeWmfY3-CYsIIw" name="PersonalFile"/>
+</uml:Package>
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/TimeTracking.di b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/TimeTracking.di
new file mode 100644
index 000000000..bf9abab34
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/TimeTracking.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/TimeTracking.notation b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/TimeTracking.notation
new file mode 100644
index 000000000..6620ab438
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/TimeTracking.notation
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_oOYr8Fe-EeW4eJv2hqevuw" type="PapyrusUMLComponentDiagram" name="TimeTracking Component" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_oq2lgFe-EeW4eJv2hqevuw" type="3205">
+    <children xmi:type="notation:DecorationNode" xmi:id="_oq2lgle-EeW4eJv2hqevuw" type="5266"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_oq3MkFe-EeW4eJv2hqevuw" type="6031">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_oq3MkVe-EeW4eJv2hqevuw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_oq3Mkle-EeW4eJv2hqevuw" type="7008">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_oq3Mk1e-EeW4eJv2hqevuw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_oq3MlFe-EeW4eJv2hqevuw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_oq3MlVe-EeW4eJv2hqevuw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oq3Mlle-EeW4eJv2hqevuw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_oq3Ml1e-EeW4eJv2hqevuw" type="7009">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_oq3MmFe-EeW4eJv2hqevuw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_oq3MmVe-EeW4eJv2hqevuw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_oq3Mmle-EeW4eJv2hqevuw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oq3Mm1e-EeW4eJv2hqevuw"/>
+    </children>
+    <element xmi:type="uml:Interface" href="TimeTracking.uml#_R119oFezEeW4eJv2hqevuw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oq2lgVe-EeW4eJv2hqevuw" x="280" y="239"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_oOYr8Ve-EeW4eJv2hqevuw" name="diagram_compatibility_version" stringValue="1.1.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_oOYr8le-EeW4eJv2hqevuw"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_oOYr81e-EeW4eJv2hqevuw">
+    <owner xmi:type="uml:Package" href="TimeTracking.uml#_l4iA8FeUEeWgZ-JGsc7XXg"/>
+  </styles>
+  <element xmi:type="uml:Package" href="TimeTracking.uml#_l4iA8FeUEeWgZ-JGsc7XXg"/>
+</notation:Diagram>
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/TimeTracking.uml b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/TimeTracking.uml
new file mode 100644
index 000000000..ab0b16266
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/TimeTracking.uml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Package xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_l4iA8FeUEeWgZ-JGsc7XXg" name="TimeTracking">
+  <packagedElement xmi:type="uml:Interface" xmi:id="_R119oFezEeW4eJv2hqevuw" name="IActivity"/>
+</uml:Package>
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/model.di b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/model.di
new file mode 100644
index 000000000..bf9abab34
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/model.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/model.notation b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/model.notation
new file mode 100644
index 000000000..97985328d
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/model.notation
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_jfr6QFeUEeWgZ-JGsc7XXg" type="PapyrusUMLClassDiagram" name="NewPackageDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_s0UHUFeUEeWgZ-JGsc7XXg" type="2007">
+    <children xmi:type="notation:DecorationNode" xmi:id="_s0UuYFeUEeWgZ-JGsc7XXg" type="5026"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_s0UuYVeUEeWgZ-JGsc7XXg" type="7016">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_s0UuYleUEeWgZ-JGsc7XXg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s0UuY1eUEeWgZ-JGsc7XXg"/>
+    </children>
+    <element xmi:type="uml:Package" href="TimeTracking.uml#_l4iA8FeUEeWgZ-JGsc7XXg"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s0UHUVeUEeWgZ-JGsc7XXg" x="67" y="200"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_lLNWAFeWEeWKEqTNFdy41w" type="2007">
+    <children xmi:type="notation:DecorationNode" xmi:id="_lLPyQFeWEeWKEqTNFdy41w" type="5026"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_lLQZUFeWEeWKEqTNFdy41w" type="7016">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_lLQZUVeWEeWKEqTNFdy41w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lLQZUleWEeWKEqTNFdy41w"/>
+    </children>
+    <element xmi:type="uml:Package" href="Employee.uml#_lHCAoFeWEeWKEqTNFdy41w"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lLNWAVeWEeWKEqTNFdy41w" x="546" y="73"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_jfr6QVeUEeWgZ-JGsc7XXg" name="diagram_compatibility_version" stringValue="1.1.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_jfr6QleUEeWgZ-JGsc7XXg"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_jfr6Q1eUEeWgZ-JGsc7XXg">
+    <owner xmi:type="uml:Model" href="model.uml#_hG1zkFeUEeWgZ-JGsc7XXg"/>
+    <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmpNxhEeOqHvRyiN87hA"/>
+  </styles>
+  <element xmi:type="uml:Model" href="model.uml#_hG1zkFeUEeWgZ-JGsc7XXg"/>
+</notation:Diagram>
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/model.uml b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/model.uml
new file mode 100644
index 000000000..b23aeceb5
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit1/model.uml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_hG1zkFeUEeWgZ-JGsc7XXg" name="RootElement">
+  <packagedElement xmi:type="uml:Package" href="Employee.uml#_lHCAoFeWEeWKEqTNFdy41w"/>
+  <packagedElement xmi:type="uml:Package" href="TimeTracking.uml#_l4iA8FeUEeWgZ-JGsc7XXg"/>
+</uml:Model>
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit2/model.di b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit2/model.di
new file mode 100644
index 000000000..bf9abab34
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit2/model.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit2/model.notation b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit2/model.notation
new file mode 100644
index 000000000..ac2de745d
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit2/model.notation
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_jfr6QFeUEeWgZ-JGsc7XXg" type="PapyrusUMLClassDiagram" name="NewPackageDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_s0UHUFeUEeWgZ-JGsc7XXg" type="2007">
+      <children xmi:type="notation:DecorationNode" xmi:id="_s0UuYFeUEeWgZ-JGsc7XXg" type="5026"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_s0UuYVeUEeWgZ-JGsc7XXg" type="7016">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_s0UuYleUEeWgZ-JGsc7XXg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s0UuY1eUEeWgZ-JGsc7XXg"/>
+      </children>
+      <element xmi:type="uml:Package" href="model.uml#_l4iA8FeUEeWgZ-JGsc7XXg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s0UHUVeUEeWgZ-JGsc7XXg" x="67" y="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lLNWAFeWEeWKEqTNFdy41w" type="2007">
+      <children xmi:type="notation:DecorationNode" xmi:id="_lLPyQFeWEeWKEqTNFdy41w" type="5026"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lLQZUFeWEeWKEqTNFdy41w" type="7016">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lLQZUVeWEeWKEqTNFdy41w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lLQZUleWEeWKEqTNFdy41w"/>
+      </children>
+      <element xmi:type="uml:Package" href="model.uml#_lHCAoFeWEeWKEqTNFdy41w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lLNWAVeWEeWKEqTNFdy41w" x="546" y="73"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_jfr6QVeUEeWgZ-JGsc7XXg" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_jfr6QleUEeWgZ-JGsc7XXg"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_jfr6Q1eUEeWgZ-JGsc7XXg">
+      <owner xmi:type="uml:Model" href="model.uml#_hG1zkFeUEeWgZ-JGsc7XXg"/>
+      <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmpNxhEeOqHvRyiN87hA"/>
+    </styles>
+    <element xmi:type="uml:Model" href="model.uml#_hG1zkFeUEeWgZ-JGsc7XXg"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_4Qrt4Fx_EeWmfY3-CYsIIw" type="PapyrusUMLComponentDiagram" name="Employee component" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_A1Pv8FyAEeWmfY3-CYsIIw" type="3205">
+      <children xmi:type="notation:DecorationNode" xmi:id="_A1Pv8lyAEeWmfY3-CYsIIw" type="5266"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_A1Pv81yAEeWmfY3-CYsIIw" type="6031">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_A1Pv9FyAEeWmfY3-CYsIIw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_A1QXAFyAEeWmfY3-CYsIIw" type="7008">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_A1QXAVyAEeWmfY3-CYsIIw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_A1QXAlyAEeWmfY3-CYsIIw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_A1QXA1yAEeWmfY3-CYsIIw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A1QXBFyAEeWmfY3-CYsIIw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_A1QXBVyAEeWmfY3-CYsIIw" type="7009">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_A1QXBlyAEeWmfY3-CYsIIw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_A1QXB1yAEeWmfY3-CYsIIw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_A1QXCFyAEeWmfY3-CYsIIw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A1QXCVyAEeWmfY3-CYsIIw"/>
+      </children>
+      <element xmi:type="uml:Interface" href="model.uml#_A1MFkFyAEeWmfY3-CYsIIw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A1Pv8VyAEeWmfY3-CYsIIw" x="416" y="47"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_4Qrt4Vx_EeWmfY3-CYsIIw" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_4Qrt4lx_EeWmfY3-CYsIIw"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_4Qrt41x_EeWmfY3-CYsIIw">
+      <owner xmi:type="uml:Package" href="model.uml#_lHCAoFeWEeWKEqTNFdy41w"/>
+    </styles>
+    <element xmi:type="uml:Package" href="model.uml#_lHCAoFeWEeWKEqTNFdy41w"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_oOYr8Fe-EeW4eJv2hqevuw" type="PapyrusUMLComponentDiagram" name="TimeTracking Component" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_oq2lgFe-EeW4eJv2hqevuw" type="3205">
+      <children xmi:type="notation:DecorationNode" xmi:id="_oq2lgle-EeW4eJv2hqevuw" type="5266"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_oq3MkFe-EeW4eJv2hqevuw" type="6031">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_oq3MkVe-EeW4eJv2hqevuw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_oq3Mkle-EeW4eJv2hqevuw" type="7008">
+        <children xmi:type="notation:Shape" xmi:id="_HRVQUFyFEeWXt-GqGsex7g" type="1">
+          <element xmi:type="uml:Property" href="model.uml#_HQ-rAFyFEeWXt-GqGsex7g"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_HRVQUVyFEeWXt-GqGsex7g"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_oq3Mk1e-EeW4eJv2hqevuw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_oq3MlFe-EeW4eJv2hqevuw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_oq3MlVe-EeW4eJv2hqevuw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oq3Mlle-EeW4eJv2hqevuw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_oq3Ml1e-EeW4eJv2hqevuw" type="7009">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_oq3MmFe-EeW4eJv2hqevuw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_oq3MmVe-EeW4eJv2hqevuw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_oq3Mmle-EeW4eJv2hqevuw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oq3Mm1e-EeW4eJv2hqevuw"/>
+      </children>
+      <element xmi:type="uml:Interface" href="model.uml#_R119oFezEeW4eJv2hqevuw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oq2lgVe-EeW4eJv2hqevuw" x="93" y="235"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_oOYr8Ve-EeW4eJv2hqevuw" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_oOYr8le-EeW4eJv2hqevuw"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_oOYr81e-EeW4eJv2hqevuw">
+      <owner xmi:type="uml:Package" href="model.uml#_l4iA8FeUEeWgZ-JGsc7XXg"/>
+    </styles>
+    <element xmi:type="uml:Package" href="model.uml#_l4iA8FeUEeWgZ-JGsc7XXg"/>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit2/model.uml b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit2/model.uml
new file mode 100644
index 000000000..e36320e32
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit2/model.uml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_hG1zkFeUEeWgZ-JGsc7XXg" name="RootElement">
+  <packagedElement xmi:type="uml:Package" xmi:id="_lHCAoFeWEeWKEqTNFdy41w" name="Employee">
+    <packagedElement xmi:type="uml:Interface" xmi:id="_A1MFkFyAEeWmfY3-CYsIIw" name="PersonalFile"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Package" xmi:id="_l4iA8FeUEeWgZ-JGsc7XXg" name="TimeTracking">
+    <packagedElement xmi:type="uml:Interface" xmi:id="_R119oFezEeW4eJv2hqevuw" name="IActivity">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_HQ-rAFyFEeWXt-GqGsex7g" name="name"/>
+    </packagedElement>
+  </packagedElement>
+</uml:Model>
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit3/model.di b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit3/model.di
new file mode 100644
index 000000000..bf9abab34
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit3/model.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit3/model.notation b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit3/model.notation
new file mode 100644
index 000000000..233e024f9
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit3/model.notation
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_jfr6QFeUEeWgZ-JGsc7XXg" type="PapyrusUMLClassDiagram" name="NewPackageDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_s0UHUFeUEeWgZ-JGsc7XXg" type="2007">
+      <children xmi:type="notation:DecorationNode" xmi:id="_s0UuYFeUEeWgZ-JGsc7XXg" type="5026"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_s0UuYVeUEeWgZ-JGsc7XXg" type="7016">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_s0UuYleUEeWgZ-JGsc7XXg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s0UuY1eUEeWgZ-JGsc7XXg"/>
+      </children>
+      <element xmi:type="uml:Package" href="model.uml#_l4iA8FeUEeWgZ-JGsc7XXg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s0UHUVeUEeWgZ-JGsc7XXg" x="67" y="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lLNWAFeWEeWKEqTNFdy41w" type="2007">
+      <children xmi:type="notation:DecorationNode" xmi:id="_lLPyQFeWEeWKEqTNFdy41w" type="5026"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lLQZUFeWEeWKEqTNFdy41w" type="7016">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lLQZUVeWEeWKEqTNFdy41w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lLQZUleWEeWKEqTNFdy41w"/>
+      </children>
+      <element xmi:type="uml:Package" href="model.uml#_lHCAoFeWEeWKEqTNFdy41w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lLNWAVeWEeWKEqTNFdy41w" x="546" y="73"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_jfr6QVeUEeWgZ-JGsc7XXg" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_jfr6QleUEeWgZ-JGsc7XXg"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_jfr6Q1eUEeWgZ-JGsc7XXg">
+      <owner xmi:type="uml:Model" href="model.uml#_hG1zkFeUEeWgZ-JGsc7XXg"/>
+      <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmpNxhEeOqHvRyiN87hA"/>
+    </styles>
+    <element xmi:type="uml:Model" href="model.uml#_hG1zkFeUEeWgZ-JGsc7XXg"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_oOYr8Fe-EeW4eJv2hqevuw" type="PapyrusUMLComponentDiagram" name="TimeTracking Component" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_oq2lgFe-EeW4eJv2hqevuw" type="3205">
+      <children xmi:type="notation:DecorationNode" xmi:id="_oq2lgle-EeW4eJv2hqevuw" type="5266"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_oq3MkFe-EeW4eJv2hqevuw" type="6031">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_oq3MkVe-EeW4eJv2hqevuw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_oq3Mkle-EeW4eJv2hqevuw" type="7008">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_oq3Mk1e-EeW4eJv2hqevuw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_oq3MlFe-EeW4eJv2hqevuw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_oq3MlVe-EeW4eJv2hqevuw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oq3Mlle-EeW4eJv2hqevuw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_oq3Ml1e-EeW4eJv2hqevuw" type="7009">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_oq3MmFe-EeW4eJv2hqevuw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_oq3MmVe-EeW4eJv2hqevuw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_oq3Mmle-EeW4eJv2hqevuw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oq3Mm1e-EeW4eJv2hqevuw"/>
+      </children>
+      <element xmi:type="uml:Interface" href="model.uml#_R119oFezEeW4eJv2hqevuw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oq2lgVe-EeW4eJv2hqevuw" x="280" y="239"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_oOYr8Ve-EeW4eJv2hqevuw" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_oOYr8le-EeW4eJv2hqevuw"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_oOYr81e-EeW4eJv2hqevuw">
+      <owner xmi:type="uml:Package" href="model.uml#_l4iA8FeUEeWgZ-JGsc7XXg"/>
+    </styles>
+    <element xmi:type="uml:Package" href="model.uml#_l4iA8FeUEeWgZ-JGsc7XXg"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_4Qrt4Fx_EeWmfY3-CYsIIw" type="PapyrusUMLComponentDiagram" name="Employee component" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_A1Pv8FyAEeWmfY3-CYsIIw" type="3205">
+      <children xmi:type="notation:DecorationNode" xmi:id="_A1Pv8lyAEeWmfY3-CYsIIw" type="5266"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_A1Pv81yAEeWmfY3-CYsIIw" type="6031">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_A1Pv9FyAEeWmfY3-CYsIIw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_A1QXAFyAEeWmfY3-CYsIIw" type="7008">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_A1QXAVyAEeWmfY3-CYsIIw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_A1QXAlyAEeWmfY3-CYsIIw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_A1QXA1yAEeWmfY3-CYsIIw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A1QXBFyAEeWmfY3-CYsIIw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_A1QXBVyAEeWmfY3-CYsIIw" type="7009">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_A1QXBlyAEeWmfY3-CYsIIw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_A1QXB1yAEeWmfY3-CYsIIw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_A1QXCFyAEeWmfY3-CYsIIw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A1QXCVyAEeWmfY3-CYsIIw"/>
+      </children>
+      <element xmi:type="uml:Interface" href="model.uml#_A1MFkFyAEeWmfY3-CYsIIw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A1Pv8VyAEeWmfY3-CYsIIw" x="416" y="47"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_4Qrt4Vx_EeWmfY3-CYsIIw" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_4Qrt4lx_EeWmfY3-CYsIIw"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_4Qrt41x_EeWmfY3-CYsIIw">
+      <owner xmi:type="uml:Package" href="model.uml#_lHCAoFeWEeWKEqTNFdy41w"/>
+    </styles>
+    <element xmi:type="uml:Package" href="model.uml#_lHCAoFeWEeWKEqTNFdy41w"/>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit3/model.uml b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit3/model.uml
new file mode 100644
index 000000000..afbde2df3
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/pseudoconflicts/data/case001/commit3/model.uml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_hG1zkFeUEeWgZ-JGsc7XXg" name="RootElement">
+  <packagedElement xmi:type="uml:Package" xmi:id="_lHCAoFeWEeWKEqTNFdy41w" name="Employee">
+    <packagedElement xmi:type="uml:Interface" xmi:id="_A1MFkFyAEeWmfY3-CYsIIw" name="PersonalFile"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Package" xmi:id="_l4iA8FeUEeWgZ-JGsc7XXg" name="TimeTracking">
+    <packagedElement xmi:type="uml:Interface" xmi:id="_R119oFezEeW4eJv2hqevuw" name="IActivity"/>
+  </packagedElement>
+</uml:Model>
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/suite/PapyrusGitTests.java b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/suite/PapyrusGitTests.java
index f8a6b3031..99afa0793 100644
--- a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/suite/PapyrusGitTests.java
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/suite/PapyrusGitTests.java
@@ -14,6 +14,7 @@ package org.eclipse.emf.compare.diagram.papyrus.tests.suite;
 
 import org.eclipse.emf.compare.ComparePackage;
 import org.eclipse.emf.compare.diagram.internal.extensions.ExtensionsPackage;
+import org.eclipse.emf.compare.diagram.papyrus.tests.conflicts.pseudoconflicts.MoveOfDiagramPseudoConflictDetection;
 import org.eclipse.emf.compare.diagram.papyrus.tests.egit.IgnoreDiFileChangesInGitMergeTest;
 import org.eclipse.emf.compare.diagram.papyrus.tests.egit.ResourceAttachmentChangeAdd1GitMergeTest;
 import org.eclipse.emf.compare.diagram.papyrus.tests.egit.ResourceAttachmentChangeAdd2GitMergeTest;
@@ -52,6 +53,7 @@ import junit.textui.TestRunner;
 	ResourceAttachmentChangeMoveNoConflictTests.class,
 	StereotypeConflictTest.class,
 	IgnoreDiFileChangesInGitMergeTest.class,
+	MoveOfDiagramPseudoConflictDetection.class
 	})
 public class PapyrusGitTests {
 	/**
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/ResourceAttachmentChangeConflictSearch.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/ResourceAttachmentChangeConflictSearch.java
index bd7596fd5..6fa3e50e9 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/ResourceAttachmentChangeConflictSearch.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/ResourceAttachmentChangeConflictSearch.java
@@ -16,6 +16,7 @@ import static org.eclipse.emf.compare.ConflictKind.PSEUDO;
 import static org.eclipse.emf.compare.ConflictKind.REAL;
 import static org.eclipse.emf.compare.DifferenceKind.ADD;
 import static org.eclipse.emf.compare.DifferenceKind.DELETE;
+import static org.eclipse.emf.compare.DifferenceKind.MOVE;
 import static org.eclipse.emf.compare.internal.utils.ComparisonUtil.isDeleteOrUnsetDiff;
 import static org.eclipse.emf.compare.utils.EMFComparePredicates.possiblyConflictingWith;
 
@@ -260,6 +261,23 @@ public class ResourceAttachmentChangeConflictSearch {
 					conflict(candidate, REAL);
 				}
 			}
+
+			EList<Diff> diffsInSameMatch = diff.getMatch().getDifferences();
+			for (Diff candidate : Iterables.filter(diffsInSameMatch, and(possiblyConflictingWith(diff),
+					instanceOf(ResourceAttachmentChange.class)))) {
+				ConflictKind kind = REAL;
+				if (candidate.getKind() == MOVE) {
+					final Match match = diff.getMatch();
+					final Resource diffRes;
+					final Resource candidateRes;
+					diffRes = match.getOrigin().eResource();
+					candidateRes = match.getOrigin().eResource();
+					if (getMatchResource(diffRes) == getMatchResource(candidateRes)) {
+						kind = PSEUDO;
+					}
+				}
+				conflict(candidate, kind);
+			}
 		}
 	}
 }