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, bugs/350120 has been updated
via 8f6d41a78a55ae3dc65e67852723cdf20abdb575 (commit)
via 55879abe26a4da0bba76e3b5dd08c397e43fe2b4 (commit)
via 3257adbb83ef7e4247d0c2b628f8d16dee7742ed (commit)
via 2cbd0ea698562a66be04296aaf0fb97783084d34 (commit)
via c993a985b5a796fa4a7b1218c635b1bc17b086ac (commit)
via 7071cb1cd5f9a14529f3be4c8ad319848aa94715 (commit)
via 20527bdddd1d43eb05d371fd2c91eb48ff4f6f43 (commit)
via e36775cdfdf25055e5b358e06eefd27e062beb57 (commit)
from 5560429ce3fb9be17568f0b92bbfdb9f609dca1b (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 8f6d41a78a55ae3dc65e67852723cdf20abdb575
Author: Egidijus Vaisnora <[email protected]>
Date: Wed Jan 11 17:32:12 2012 +0200
Added weak reference for the view
commit 55879abe26a4da0bba76e3b5dd08c397e43fe2b4
Author: Egidijus Vaisnora <[email protected]>
Date: Wed Jan 11 15:39:15 2012 +0200
Fixed WorkspaceTest.testCheckinAfterDetach2
commit 3257adbb83ef7e4247d0c2b628f8d16dee7742ed
Author: Egidijus Vaisnora <[email protected]>
Date: Wed Jan 11 09:56:14 2012 +0200
Fixed MergingTest.testFromBranchRemovalInSource
commit 2cbd0ea698562a66be04296aaf0fb97783084d34
Merge: c993a98 7071cb1
Author: Egidijus Vaisnora <[email protected]>
Date: Mon Jan 9 17:46:29 2012 +0200
Merge branch 'master' of
ssh://[email protected]/gitroot/cdo/cdo.git into bugs/350120
commit c993a985b5a796fa4a7b1218c635b1bc17b086ac
Author: Egidijus Vaisnora <[email protected]>
Date: Thu Jan 5 18:18:09 2012 +0200
Introduced server side checking for stale revision
commit e36775cdfdf25055e5b358e06eefd27e062beb57
Author: Egidijus Vaisnora <[email protected]>
Date: Wed Jan 4 16:59:40 2012 +0200
Patch applied from the
https://bugs.eclipse.org/bugs/show_bug.cgi?id=350120
-----------------------------------------------------------------------
Summary of changes:
...ialCollectionLoadingNotSupportedException.java} | 16 +-
.../revision/delta/CDORevisionDeltaImpl.java | 3 +-
.../net4j/protocol/CommitTransactionRequest.java | 5 +-
.../internal/hibernate/HibernateStoreAccessor.java | 5 +-
.../emf/cdo/server/internal/mongodb/Commits.java | 5 +-
.../protocol/CommitTransactionIndication.java | 7 +-
.../.settings/.api_filters | 696 ++++++++++----------
.../internal/server/DelegatingCommitContext.java | 3 +-
.../emf/cdo/internal/server/ServerCDOView.java | 10 +
.../internal/server/TransactionCommitContext.java | 53 +-
.../embedded/EmbeddedClientSessionProtocol.java | 2 +-
.../server/syncing/ReplicatorCommitContext.java | 15 +-
.../server/syncing/SynchronizableRepository.java | 6 +-
.../org/eclipse/emf/cdo/server/IStoreAccessor.java | 5 +-
.../emf/cdo/spi/server/InternalCommitContext.java | 6 +-
.../eclipse/emf/cdo/spi/server/StoreAccessor.java | 15 +-
.../org/eclipse/emf/cdo/tests/AbstractCDOTest.java | 1 -
.../eclipse/emf/cdo/tests/StateMachineTest.java | 16 +-
.../cdo/tests/bugzilla/Bugzilla_252214_Test.java | 3 +-
.../cdo/tests/bugzilla/Bugzilla_350120_Test.java | 223 +++++++
.../src/org/eclipse/emf/cdo/view/CDOView.java | 110 ++--
.../eclipse/emf/internal/cdo/CDOObjectImpl.java | 45 +-
.../emf/internal/cdo/object/CDOLegacyAdapter.java | 3 +-
.../emf/internal/cdo/object/CDOLegacyWrapper.java | 4 +-
.../cdo/object/CDONotificationBuilder.java | 9 +
.../cdo/transaction/CDOTransactionImpl.java | 28 +-
.../emf/internal/cdo/view/AbstractCDOView.java | 35 +-
.../emf/internal/cdo/view/CDOStateMachine.java | 80 ++-
.../eclipse/emf/internal/cdo/view/CDOViewImpl.java | 52 ++-
.../spi/cdo/AbstractObjectConflictResolver.java | 8 +-
.../org/eclipse/emf/spi/cdo/InternalCDOView.java | 5 +
.../net4j/internal/util/bundle/AbstractBundle.java | 33 +-
.../eclipse/net4j/internal/util/om/OSGiBundle.java | 38 +-
33 files changed, 1033 insertions(+), 512 deletions(-)
copy
plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/{TransportException.java
=> PartialCollectionLoadingNotSupportedException.java} (54%)
create mode 100644
plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_350120_Test.java
hooks/post-receive
--
CDO Model Repository
_______________________________________________
cdo-commit mailing list
[email protected]
http://dev.eclipse.org/mailman/listinfo/cdo-commit