diff options
| author | Eike Stepper | 2015-09-14 06:30:08 +0000 |
|---|---|---|
| committer | Eike Stepper | 2015-09-14 06:30:08 +0000 |
| commit | 6e75f74d648d642e47d358fffa603a8a6858a35b (patch) | |
| tree | 66d0df51917c691c32b9c6fb9ead6252eb5fa1aa | |
| parent | 65d335a670ad3ccc0777482f7cf4134c890d05c1 (diff) | |
| download | cdo-6e75f74d648d642e47d358fffa603a8a6858a35b.tar.gz cdo-6e75f74d648d642e47d358fffa603a8a6858a35b.tar.xz cdo-6e75f74d648d642e47d358fffa603a8a6858a35b.zip | |
[477305] Add Interactive Transaction Conflict Resolution
https://bugs.eclipse.org/bugs/show_bug.cgi?id=477305
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/CDOCompareEditorUtil.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/CDOCompareEditorUtil.java b/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/CDOCompareEditorUtil.java index 983539db39..da07eeb77b 100644 --- a/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/CDOCompareEditorUtil.java +++ b/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/CDOCompareEditorUtil.java @@ -833,7 +833,6 @@ public class CDOCompareEditorUtil if (!idMappings.isEmpty()) { CDOIDMapper idMapper = new CDOIDMapper(idMappings); - // idMapper.setAllowUnmappedTempIDs(true); for (CDOObject newObject : values) { |