This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CDO Model Repository".
The branch, master has been updated
via 7360d35d7920ce876d25505a58082dfb41962be1 (commit)
via ffcb70d4a9c57a83eeddb30375f81210d4aeb5cc (commit)
via 264796348c5cbfacffd29f9c4ac00be22801dc12 (commit)
via 17755d7e072b56ea215b5f84b21af56bd4f9bfcf (commit)
via 6a39fef59347342aaacc5a58b2d89c5f1468c4d7 (commit)
via c62df6bb8eb58016eb467ca3fc27a90c5dc3f666 (commit)
via e9769012b82caf5f204cb54feca2bce06c03bce4 (commit)
via b01ae7806f8cc6725e28426d9ee1e68b63ebe218 (commit)
via f592216a60f85cae1b7f74c9f15f4e17d56e5757 (commit)
via 6db31b6c3acaf73feb790656422d6fb4e93b89ed (commit)
via 38ddb33c40630f799efa9fb3af1d1a3754e9201f (commit)
via cf6c29f8a8c059c6b8d9d8449700b5c807641c87 (commit)
via 1b69ce45f7ee434081c356355c8bf55faa07bfc7 (commit)
via 64e0847c1f533a77c4b1e5ebeeff6861bb362dbd (commit)
via 6dcfc7f2c3d82bf7c8131c6664e7ec0ec3d7a2dc (commit)
via c4502038ee09b24ff4300c24cc3c2ade8ee95f2b (commit)
via d1480f21d9c9d5e583734e0b1cf94684f8f19c7e (commit)
from 34ed0a54ec393dea32e742048fa4d5685f1b181b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7360d35d7920ce876d25505a58082dfb41962be1
Author: Eike Stepper <[email protected]>
Date: Tue May 21 12:45:34 2013 +0200
[396804] CDOMergingConflictResolver tests
https://bugs.eclipse.org/bugs/show_bug.cgi?id=396804
commit ffcb70d4a9c57a83eeddb30375f81210d4aeb5cc
Author: Eike Stepper <[email protected]>
Date: Tue May 21 11:22:46 2013 +0200
[396804] CDOMergingConflictResolver tests
https://bugs.eclipse.org/bugs/show_bug.cgi?id=396804
commit 264796348c5cbfacffd29f9c4ac00be22801dc12
Author: Eike Stepper <[email protected]>
Date: Tue May 21 11:16:30 2013 +0200
[396804] CDOMergingConflictResolver tests
https://bugs.eclipse.org/bugs/show_bug.cgi?id=396804
-----------------------------------------------------------------------
Summary of changes:
.../org/eclipse/emf/cdo/common/model/EMFUtil.java | 74 +
.../emf/cdo/common/revision/CDORevisionData.java | 11 +
.../common/revision/CDORevisionValueVisitor.java | 25 +
.../revision/delta/CDOFeatureDeltaVisitor.java | 6 +-
.../common/revision/delta/CDOListFeatureDelta.java | 6 +-
.../revision/delta/CDOOriginSizeProvider.java | 22 +
.../common/revision/delta/CDORevisionDelta.java | 7 +
.../common/commit/CDOChangeSetDataImpl.java | 29 +-
.../delta/CDODetachedRevisionDeltaImpl.java | 7 +
.../revision/delta/CDOListFeatureDeltaImpl.java | 44 +-
.../revision/delta/CDORevisionDeltaImpl.java | 63 +-
.../delta/CDOSingleValueFeatureDeltaImpl.java | 3 +-
.../spi/common/revision/AbstractCDORevision.java | 40 +
.../spi/common/revision/DelegatingCDORevision.java | 19 +
.../common/revision/InternalCDOFeatureDelta.java | 6 +
.../common/revision/InternalCDORevisionDelta.java | 10 +
.../eclipse/emf/cdo/security/impl/package-use.html | 187 --
.../gitbash/repository/GitCopyrightsAction.java | 500 +++++
.../emf/cdo/internal/server/mem/MEMStore.java | 2 +-
.../org/eclipse/emf/cdo/tests/AbstractCDOTest.java | 164 ++-
.../src/org/eclipse/emf/cdo/tests/AllConfigs.java | 17 +-
.../emf/cdo/tests/Bugzilla_396804_Test.java | 3 +-
.../cdo/tests/ConflictResolverExtendedTest.java | 2192 ++++++++++----------
.../emf/cdo/tests/ConflictResolverMergingTest.java | 2 +
.../src/org/eclipse/emf/cdo/tests/MergingTest.java | 69 +-
.../cdo/tests/bugzilla/Bugzilla_316887_Test.java | 136 --
.../cdo/tests/bugzilla/Bugzilla_383370_Test.java | 5 +
.../org/eclipse/emf/cdo/tests/config/IConfig.java | 2 +
.../emf/cdo/tests/config/impl/Scenario.java | 1 +
.../eclipse/emf/internal/cdo/CDOObjectImpl.java | 15 +-
.../internal/cdo/transaction/CDOSavepointImpl.java | 3 +-
.../cdo/transaction/CDOTransactionImpl.java | 43 +-
.../eclipse/emf/internal/cdo/view/CDOViewImpl.java | 2 +
.../cdo/AbstractChangeSetsConflictResolver.java | 5 +
.../spi/cdo/AbstractObjectConflictResolver.java | 2 +-
.../emf/spi/cdo/CDOMergingConflictResolver.java | 251 ++-
.../org/eclipse/emf/spi/cdo/DefaultCDOMerger.java | 719 ++++++-
.../src/org/eclipse/net4j/util/Predicate.java | 20 +
.../src/org/eclipse/net4j/util/Predicates.java | 50 +
.../net4j/util/collection/PredicateIterator.java | 2 +
40 files changed, 3023 insertions(+), 1741 deletions(-)
create mode 100644
plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionValueVisitor.java
create mode 100644
plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOOriginSizeProvider.java
create mode 100644
plugins/org.eclipse.emf.cdo.releng.gitbash/src/org/eclipse/emf/cdo/releng/gitbash/repository/GitCopyrightsAction.java
delete mode 100644
plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316887_Test.java
create mode 100644
plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/Predicate.java
create mode 100644
plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/Predicates.java
hooks/post-receive
--
CDO Model Repository
_______________________________________________
cdo-commit mailing list
[email protected]
http://dev.eclipse.org/mailman/listinfo/cdo-commit
