Skip to main content
summaryrefslogtreecommitdiffstats
path: root/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java
AgeCommit message (Expand)AuthorFilesLines
2010-12-10[332264] CDOMergingConflictResolver does not work with multiple commits.Pascal Lehmann1-2/+75
2010-10-20[327405] Provide an offline CDOWorkspace with Checkout/Update/Commit workflowsEike Stepper1-1/+4
2010-10-07removed sleep() from test caseEike Stepper1-5/+4
2010-09-30replaced sleep()Eike Stepper1-2/+3
2010-08-09[319090] Provide a CDOConflictResolver that uses a CDOMergerEike Stepper1-9/+4
2010-08-09[319090] Provide a CDOConflictResolver that uses a CDOMergerEike Stepper1-0/+36
2010-06-05[312404] Wrong order of CommitRunnables in RepositorySynchronizerEike Stepper1-1/+1
2010-05-27changed timing slightlyEike Stepper1-0/+1
2010-05-27changed timing slightlyEike Stepper1-3/+3
2010-03-31[247226] Transparently support legacy models (CDOLegacyAdapter)Martin Fluegge1-0/+3
2010-02-28[280102] CDOView.getRootResource() fails for empty repositoryEike Stepper1-9/+4
2010-02-28[280102] CDOView.getRootResource() fails for empty repositoryEike Stepper1-8/+19
2010-02-20[256936] Support for Offline ModeEike Stepper1-2/+2
2010-02-03adjust legal headersEike Stepper1-1/+1
2009-05-05formattingEike Stepper1-2/+1
2009-01-13Prepare common queryEike Stepper1-1/+1
2009-01-11fixed copyrightsEike Stepper1-2/+2
2009-01-11fixed copyrightsEike Stepper1-0/+1
2009-01-10fixed copyrightsEike Stepper1-1/+1
2009-01-10[260613] Cleanup cdo.common pluginEike Stepper1-3/+3
2008-12-28[258850] Make Options extend INotifierEike Stepper1-2/+2
2008-12-15[258829] [POLISH] Add CDOObject.isConflict, CDOObject.isInvalidSimon McDuff1-4/+2
2008-12-15[257372] Handle conflict object without rollback the view completelySimon McDuff1-0/+92

    Back to the top