Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2016-10-31 02:45:52 -0400
committerEike Stepper2016-10-31 02:45:52 -0400
commit903264bbd42577d19e0e26ecf5b1e490b31958ef (patch)
tree021e98098b0781cc015f1ae7fe9207fad46f78a4 /plugins/org.eclipse.emf.cdo.tests/src
parent57fb85babf4c6b459f8e2e370e9665b9d8097868 (diff)
downloadcdo-903264bbd42577d19e0e26ecf5b1e490b31958ef.tar.gz
cdo-903264bbd42577d19e0e26ecf5b1e490b31958ef.tar.xz
cdo-903264bbd42577d19e0e26ecf5b1e490b31958ef.zip
[506768] New commit can change the base revisions of a just created branch
https://bugs.eclipse.org/bugs/show_bug.cgi?id=506768
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests/src')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314264_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_314264_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314264_Test.java
index 56b1667340..c488523dac 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314264_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314264_Test.java
@@ -56,7 +56,7 @@ public class Bugzilla_314264_Test extends AbstractCDOTest
container1.getTasks().add(getModel2Factory().createTask());
tr1.commit();
- CDOBranch branch2 = tr1.getBranch().createBranch("branch2");
+ CDOBranch branch2 = tr1.getBranch().createBranch("branch-" + System.currentTimeMillis());
CDOTransaction tr2 = session.openTransaction(branch2);
TaskContainer container2 = tr2.getObject(container1);
@@ -71,7 +71,7 @@ public class Bugzilla_314264_Test extends AbstractCDOTest
commitAndSync(tr2, tr1);
// Merge the other branch to main.
- tr1.merge(tr2.getBranch().getHead(), new DefaultCDOMerger.PerFeature.ManyValued());
+ tr1.merge(tr2.getBranch(), new DefaultCDOMerger.PerFeature.ManyValued());
tr1.commit();
assertEquals(false, tr1.isDirty());

Back to the top