[396804] CDOMergingConflictResolver tests (93c62bac) · Commits · Florent Angebault / eclipse-cdo · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

eclipse-cdo
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

93c62bac

Commit 93c62bac authored 12 years ago by Eike Stepper

Downloads
- Patches
- Plain Diff

[396804] CDOMergingConflictResolver tests

https://bugs.eclipse.org/bugs/show_bug.cgi?id=396804

parent b48ab61b

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/Bugzilla_396804_Test.java 139 additions, 0 deletions

...s/src/org/eclipse/emf/cdo/tests/Bugzilla_396804_Test.java
plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverExtendedTest.java 2 additions, 2 deletions

...g/eclipse/emf/cdo/tests/ConflictResolverExtendedTest.java
plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverMergingTest.java 22 additions, 14 deletions

...rg/eclipse/emf/cdo/tests/ConflictResolverMergingTest.java
plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java 80 additions, 98 deletions

.../org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractChangeSetsConflictResolver.java 31 additions, 15 deletions

...lipse/emf/spi/cdo/AbstractChangeSetsConflictResolver.java
plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.java 44 additions, 41 deletions

...c/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.java
plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionInvalidationAggregator.java 4 additions, 68 deletions

...eclipse/emf/spi/cdo/CDOSessionInvalidationAggregator.java
plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionInvalidationEventQueue.java 93 additions, 0 deletions

...eclipse/emf/spi/cdo/CDOSessionInvalidationEventQueue.java

with 415 additions and 238 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment