diff options
| author | Eike Stepper | 2010-09-23 18:31:09 +0000 |
|---|---|---|
| committer | Eike Stepper | 2010-09-23 18:31:09 +0000 |
| commit | 28726f020f8ce98eac682e42e430f42356298ca8 (patch) | |
| tree | 28ae2883262fd370c32cf8baf622c2f08827d94a | |
| parent | e2cf587bf4ef4c66f900b8dbb962c854a9d88cc9 (diff) | |
| download | cdo-28726f020f8ce98eac682e42e430f42356298ca8.tar.gz cdo-28726f020f8ce98eac682e42e430f42356298ca8.tar.xz cdo-28726f020f8ce98eac682e42e430f42356298ca8.zip | |
*** empty log message ***
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_325866_Test.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_325866_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_325866_Test.java index bf7cfb15ad..e14c02e1ac 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_325866_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_325866_Test.java @@ -89,6 +89,7 @@ public class Bugzilla_325866_Test extends AbstractCDOTest assertEquals(false, s1Tr3.isDirty()); // merge the other branch to main. + sleep(1000L); s1Tr1.merge(s1Tr3.getBranch().getHead(), new DefaultCDOMerger.PerFeature.ManyValued()); s1Tr1.commit(); |