Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-09-23 18:05:42 +0000
committerEike Stepper2010-09-23 18:05:42 +0000
commitf50474b0156dc9b3b2c04b55add634563db91670 (patch)
tree5d111298711df7429a73057fb2a8cdc872d8b738
parent6f7a14f4e6f2a5a0073469e24e83e7c5d66fa44f (diff)
downloadcdo-f50474b0156dc9b3b2c04b55add634563db91670.tar.gz
cdo-f50474b0156dc9b3b2c04b55add634563db91670.tar.xz
cdo-f50474b0156dc9b3b2c04b55add634563db91670.zip
[324084] CommitException with XRef on new objects after branch merge
https://bugs.eclipse.org/bugs/show_bug.cgi?id=324084
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324084_Test.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324084_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324084_Test.java
index 20035b770a..dd0635bcb4 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324084_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324084_Test.java
@@ -70,7 +70,7 @@ public class Bugzilla_324084_Test extends AbstractCDOTest
tr2.commit();
// sleep to have the merger see the changes.
- // sleep(1000);
+ sleep(1000);
// merge the other branch to main.
tr1.merge(tr2.getBranch().getHead(), new DefaultCDOMerger.PerFeature.ManyValued());
@@ -107,7 +107,7 @@ public class Bugzilla_324084_Test extends AbstractCDOTest
tr2.commit();
// sleep to have the merger see the changes.
- // sleep(1000);
+ sleep(1000);
// merge the other branch to main.
tr1.merge(tr2.getBranch().getHead(), new DefaultCDOMerger.PerFeature.ManyValued());

Back to the top