Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2016-10-18 16:45:48 +0000
committerEike Stepper2016-10-18 16:45:48 +0000
commitf0d27bf78e55f581b1129b3404d8a5951ad38b08 (patch)
tree7fe8a79175e455479a75603ea967bb55aa74bada /plugins/org.eclipse.emf.cdo.doc/javadoc
parent1d811b880ef99b5c7b57f5dd0c73ed041f9af716 (diff)
downloadcdo-f0d27bf78e55f581b1129b3404d8a5951ad38b08.tar.gz
cdo-f0d27bf78e55f581b1129b3404d8a5951ad38b08.tar.xz
cdo-f0d27bf78e55f581b1129b3404d8a5951ad38b08.zip
[Releng] Regenerate documentation
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/allclasses-frame.html11
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/allclasses-noframe.html11
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/constant-values.html58
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/deprecated-list.html172
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/index-all.html340
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/CDOObjectHistory.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/CDOObjectReference.html69
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/CDOState.html68
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/admin/CDOAdminClientRepository.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/class-use/CDOObject.html71
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html364
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonRepository.IDGenerationLocation.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonRepository.html70
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonTransaction.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonView.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/admin/CDOAdminRepository.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranch.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchChangedEvent.html8
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchCreatedEvent.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html8
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html235
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchTag.html6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html15
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranch.html107
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPoint.html255
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPointRange.html27
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranchProvider.html840
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-frame.html1
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-summary.html10
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-use.html174
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/class-use/CDOCommonRepository.CommitInfoStorage.html202
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.TriggerLoadElement.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.html12
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html61
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html69
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSet.html27
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSetData.html46
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOCommitData.html10
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOCommitHistory.Provider.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOCommitInfo.html31
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOCommitInfoProvider.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/package-summary.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/package-use.html12
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/id/class-use/CDOID.html132
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lob/CDOBlob.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lob/CDOClob.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lob/CDOLobHandler.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lob/class-use/CDOBlob.html25
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lob/class-use/CDOClob.html25
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lob/class-use/CDOLob.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lob/class-use/CDOLobHandler.html6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lob/class-use/CDOLobInfo.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lob/package-summary.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lob/package-use.html22
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/CDOLockChangeInfo.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockArea.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/class-use/CDOLockState.html65
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/package-use.html5
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/package-frame.html1
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/package-summary.html15
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/package-use.html42
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/protocol/class-use/CDODataInput.html21
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/protocol/class-use/CDODataOutput.html15
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/CDOIDAndBranch.html8
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/CDORevisable.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/CDORevision.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/CDORevisionCache.EvictionEvent.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/CDORevisionHandler.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/CDORevisionKey.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/class-use/CDORevisionHandler.html6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/class-use/CDORevisionManager.html25
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/class-use/CDORevisionProvider.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/CDOSetFeatureDelta.html10
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/class-use/CDOFeatureDelta.html16
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/package-use.html6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/CDOException.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/CDOQueryInfo.html30
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/CDORenameContext.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/CDOResourceNodeNotFoundException.html313
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/CDOTimeProvider.html10
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/CDOVersionProvider.html235
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/CountedTimeProvider.html297
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/CurrentTimeProvider.html287
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/NotAuthenticatedException.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/class-use/CDOException.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/class-use/CDOResourceNodeNotFoundException.html123
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/class-use/CDOTimeProvider.html56
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/class-use/CDOVersionProvider.html325
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/class-use/CountedTimeProvider.html123
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/class-use/CurrentTimeProvider.html123
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/package-frame.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/package-summary.html24
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/package-use.html80
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.html141
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/expressions/impl/ExpressionsPackageImpl.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/expressions/provider/ExpressionsItemProviderAdapterFactory.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/security/impl/SecurityPackageImpl.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/CDOServerExporter.XML.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/CDOServerExporter.XMLConstants.html44
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/CDOServerImporter.Handler.html8
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/CDOServerImporter.Handler2.html284
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/CDOServerImporter.XML.html8
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/CDOServerImporter.html6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/IQueryContext.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/IQueryHandlerProvider.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/IRepository.Props.html38
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/IRepository.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/IStoreAccessor.CommitContext.html71
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/IStoreAccessor.QueryResourcesContext.ExactMatch.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/IStoreAccessor.QueryResourcesContext.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/IStoreAccessor.QueryXRefsContext.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/IStoreAccessor.Raw.html8
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/IStoreAccessor.Raw2.html352
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/IStoreAccessor.UnitSupport.html6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/IStoreAccessor.html9
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/ISynchronizableRepository.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/ITransaction.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/IView.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/class-use/CDOServerImporter.Handler.html15
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/class-use/CDOServerImporter.Handler2.html123
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/class-use/IQueryHandlerProvider.html9
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/class-use/IStoreAccessor.Raw.html33
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/class-use/IStoreAccessor.Raw2.html167
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/class-use/IStoreAccessor.html7
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db/IDBStoreAccessor.html25
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreAccessor.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/lissome/ILissomeStoreAccessor.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/mongodb/IMongoDBStoreAccessor.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/objectivity/IObjectivityStoreAccessor.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/package-frame.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/package-summary.html65
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/package-use.html30
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/CDORepositoryInfo.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/CDOSessionLocksChangedEvent.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html176
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranch.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.BranchLoader.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/branch/class-use/InternalCDOBranchManager.BranchLoader.html7
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.Handler.html230
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html165
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/commit/CDOCommitInfoUtil.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html37
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/commit/InternalCDOCommitInfoManager.CommitInfoLoader.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/commit/InternalCDOCommitInfoManager.html62
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/commit/class-use/CDOChangeSetSegment.Handler.html178
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/commit/class-use/CDOChangeSetSegment.html23
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/commit/class-use/CDORevisionAvailabilityInfo.html74
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/commit/class-use/InternalCDOCommitInfoManager.CommitInfoLoader.html7
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/commit/package-frame.html1
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/commit/package-summary.html6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/commit/package-use.html5
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/AbstractCDORevision.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevision.html6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/DetachedCDORevision.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionDelta.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/PointerCDORevision.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/StubCDORevision.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/SyntheticCDORevision.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/server/DelegatingQueryResourcesContext.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/server/DurableLockArea.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/server/InternalCommitContext.html51
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/server/InternalFailoverParticipant.html6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/server/InternalRepository.html163
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/server/InternalSynchronizableRepository.html6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/server/InternalTransaction.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/server/InternalView.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/server/LongIDStoreAccessor.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/server/StoreAccessor.html65
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/server/StoreAccessorBase.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOAsyncTransactionHandler.html15
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOAutoAttacher.html19
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOAutoLocker.ForSingleValuedChanges.html11
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOAutoLocker.html11
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOCommitContext.html52
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html19
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler1.html47
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOPostEventTransactionHandler.Default.html7
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOPostEventTransactionHandler.html7
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOPushTransaction.html349
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransaction.html105
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.html156
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandler.html15
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.WithUndo.html292
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html29
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandlerBase.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOUserTransaction.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOCommitContext.html34
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.html40
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransaction.html20
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandler1.WithUndo.html193
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandler1.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandlerBase.html6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-frame.html1
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-summary.html22
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-use.html19
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transfer/ui/swt/TransferComposite.html7
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transfer/ui/swt/TransferDetailsComposite.html7
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transfer/ui/swt/TransferTreeComposite.html7
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/ui/widgets/AuditScale.html7
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.LabelProvider.html82
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/ui/widgets/ComposeBranchPointComposite.html7
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/ui/widgets/SelectBranchComposite.html7
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/ui/widgets/SelectTimeStampComposite.html7
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/ui/widgets/SessionComposite.html7
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/ui/widgets/TimeSlider.html7
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/util/CDOLazyContentAdapter.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/util/CDOUtil.html101
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/util/package-summary.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/util/package-use.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOQuery.html32
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOView.html166
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOViewLocksChangedEvent.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/class-use/CDOQuery.html8
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOSessionProtocol.CommitTransactionResult.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOSessionProtocol.LockObjectsResult.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOSessionProtocol.MergeDataResult.html319
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOSessionProtocol.OpenSessionResult.html95
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOSessionProtocol.html93
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSavepoint.html50
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html262
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSession.html105
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSessionInvalidationEvent.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOTransaction.InternalCDOCommitContext.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOTransaction.html90
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOView.html100
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOXATransaction.InternalCDOXACommitContext.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/CDOSessionProtocol.MergeDataResult.html196
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOSession.MergeData.html8
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOTransaction.ApplyChangeSetResult.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOTransaction.ChangeSetOutdatedException.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-frame.html1
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-summary.html44
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-use.html74
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/serialized-form.html9
246 files changed, 10933 insertions, 1296 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/allclasses-frame.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/allclasses-frame.html
index 120cefd186..6a5226c811 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/allclasses-frame.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/allclasses-frame.html
@@ -94,6 +94,7 @@
<li><a href="org/eclipse/emf/cdo/common/branch/CDOBranchManager.html" title="interface in org.eclipse.emf.cdo.common.branch" target="classFrame"><span class="interfaceName">CDOBranchManager</span></a></li>
<li><a href="org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch" target="classFrame"><span class="interfaceName">CDOBranchPoint</span></a></li>
<li><a href="org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html" title="interface in org.eclipse.emf.cdo.common.branch" target="classFrame"><span class="interfaceName">CDOBranchPointRange</span></a></li>
+<li><a href="org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch" target="classFrame"><span class="interfaceName">CDOBranchProvider</span></a></li>
<li><a href="org/eclipse/emf/cdo/common/branch/CDOBranchTag.html" title="interface in org.eclipse.emf.cdo.common.branch" target="classFrame"><span class="interfaceName">CDOBranchTag</span></a></li>
<li><a href="org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html" title="class in org.eclipse.emf.cdo.spi.common.branch" target="classFrame">CDOBranchUtil</a></li>
<li><a href="org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html" title="interface in org.eclipse.emf.cdo.common.branch" target="classFrame"><span class="interfaceName">CDOBranchVersion</span></a></li>
@@ -105,6 +106,7 @@
<li><a href="org/eclipse/emf/cdo/common/commit/CDOChangeSetDataProvider.html" title="interface in org.eclipse.emf.cdo.common.commit" target="classFrame"><span class="interfaceName">CDOChangeSetDataProvider</span></a></li>
<li><a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetDataRevisionProvider.html" title="class in org.eclipse.emf.cdo.spi.common.commit" target="classFrame">CDOChangeSetDataRevisionProvider</a></li>
<li><a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html" title="class in org.eclipse.emf.cdo.spi.common.commit" target="classFrame">CDOChangeSetSegment</a></li>
+<li><a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.Handler.html" title="interface in org.eclipse.emf.cdo.spi.common.commit" target="classFrame"><span class="interfaceName">CDOChangeSetSegment.Handler</span></a></li>
<li><a href="org/eclipse/emf/spi/cdo/CDOChangeSubscriptionAdapter.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">CDOChangeSubscriptionAdapter</a></li>
<li><a href="org/eclipse/emf/cdo/explorer/checkouts/CDOCheckout.html" title="interface in org.eclipse.emf.cdo.explorer.checkouts" target="classFrame"><span class="interfaceName">CDOCheckout</span></a></li>
<li><a href="org/eclipse/emf/cdo/explorer/checkouts/CDOCheckout.ObjectType.html" title="enum in org.eclipse.emf.cdo.explorer.checkouts" target="classFrame">CDOCheckout.ObjectType</a></li>
@@ -136,6 +138,7 @@
<li><a href="org/eclipse/emf/cdo/spi/common/commit/CDOCommitInfoUtil.html" title="class in org.eclipse.emf.cdo.spi.common.commit" target="classFrame">CDOCommitInfoUtil</a></li>
<li><a href="org/eclipse/emf/cdo/common/util/CDOCommonEventAdapter.html" title="class in org.eclipse.emf.cdo.common.util" target="classFrame">CDOCommonEventAdapter</a></li>
<li><a href="org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common" target="classFrame"><span class="interfaceName">CDOCommonRepository</span></a></li>
+<li><a href="org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common" target="classFrame">CDOCommonRepository.CommitInfoStorage</a></li>
<li><a href="org/eclipse/emf/cdo/common/CDOCommonRepository.IDGenerationLocation.html" title="enum in org.eclipse.emf.cdo.common" target="classFrame">CDOCommonRepository.IDGenerationLocation</a></li>
<li><a href="org/eclipse/emf/cdo/common/CDOCommonRepository.State.html" title="enum in org.eclipse.emf.cdo.common" target="classFrame">CDOCommonRepository.State</a></li>
<li><a href="org/eclipse/emf/cdo/common/CDOCommonRepository.StateChangedEvent.html" title="interface in org.eclipse.emf.cdo.common" target="classFrame"><span class="interfaceName">CDOCommonRepository.StateChangedEvent</span></a></li>
@@ -367,6 +370,7 @@
<li><a href="org/eclipse/emf/cdo/eresource/CDOResourceNode.html" title="interface in org.eclipse.emf.cdo.eresource" target="classFrame"><span class="interfaceName">CDOResourceNode</span></a></li>
<li><a href="org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.html" title="class in org.eclipse.emf.cdo.eresource.impl" target="classFrame">CDOResourceNodeImpl</a></li>
<li><a href="org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.html" title="class in org.eclipse.emf.cdo.eresource.provider" target="classFrame">CDOResourceNodeItemProvider</a></li>
+<li><a href="org/eclipse/emf/cdo/common/util/CDOResourceNodeNotFoundException.html" title="class in org.eclipse.emf.cdo.common.util" target="classFrame">CDOResourceNodeNotFoundException</a></li>
<li><a href="org/eclipse/emf/cdo/session/CDORetryExceptionHandler.html" title="class in org.eclipse.emf.cdo.session" target="classFrame">CDORetryExceptionHandler</a></li>
<li><a href="org/eclipse/emf/cdo/common/revision/CDORevisable.html" title="interface in org.eclipse.emf.cdo.common.revision" target="classFrame"><span class="interfaceName">CDORevisable</span></a></li>
<li><a href="org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision" target="classFrame"><span class="interfaceName">CDORevision</span></a></li>
@@ -413,6 +417,7 @@
<li><a href="org/eclipse/emf/cdo/server/CDOServerExporter.XMLConstants.html" title="interface in org.eclipse.emf.cdo.server" target="classFrame"><span class="interfaceName">CDOServerExporter.XMLConstants</span></a></li>
<li><a href="org/eclipse/emf/cdo/server/CDOServerImporter.html" title="class in org.eclipse.emf.cdo.server" target="classFrame">CDOServerImporter</a></li>
<li><a href="org/eclipse/emf/cdo/server/CDOServerImporter.Handler.html" title="interface in org.eclipse.emf.cdo.server" target="classFrame"><span class="interfaceName">CDOServerImporter.Handler</span></a></li>
+<li><a href="org/eclipse/emf/cdo/server/CDOServerImporter.Handler2.html" title="interface in org.eclipse.emf.cdo.server" target="classFrame"><span class="interfaceName">CDOServerImporter.Handler2</span></a></li>
<li><a href="org/eclipse/emf/cdo/server/CDOServerImporter.XML.html" title="class in org.eclipse.emf.cdo.server" target="classFrame">CDOServerImporter.XML</a></li>
<li><a href="org/eclipse/emf/cdo/server/CDOServerUtil.html" title="class in org.eclipse.emf.cdo.server" target="classFrame">CDOServerUtil</a></li>
<li><a href="org/eclipse/emf/cdo/server/CDOServerUtil.RepositoryReadAccessValidator.html" title="class in org.eclipse.emf.cdo.server" target="classFrame">CDOServerUtil.RepositoryReadAccessValidator</a></li>
@@ -441,6 +446,7 @@
<li><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.CommitTransactionResult.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">CDOSessionProtocol.CommitTransactionResult</a></li>
<li><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.CommitTransactionResult.PostCommitReferenceAdjuster.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">CDOSessionProtocol.CommitTransactionResult.PostCommitReferenceAdjuster</a></li>
<li><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.LockObjectsResult.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">CDOSessionProtocol.LockObjectsResult</a></li>
+<li><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.MergeDataResult.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">CDOSessionProtocol.MergeDataResult</a></li>
<li><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.OpenSessionResult.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">CDOSessionProtocol.OpenSessionResult</a></li>
<li><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.RefreshSessionResult.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">CDOSessionProtocol.RefreshSessionResult</a></li>
<li><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.RefreshSessionResult.Provider.html" title="interface in org.eclipse.emf.spi.cdo" target="classFrame"><span class="interfaceName">CDOSessionProtocol.RefreshSessionResult.Provider</span></a></li>
@@ -479,6 +485,7 @@
<li><a href="org/eclipse/emf/cdo/transaction/CDOTransactionFinishedEvent.Type.html" title="enum in org.eclipse.emf.cdo.transaction" target="classFrame">CDOTransactionFinishedEvent.Type</a></li>
<li><a href="org/eclipse/emf/cdo/transaction/CDOTransactionHandler.html" title="interface in org.eclipse.emf.cdo.transaction" target="classFrame"><span class="interfaceName">CDOTransactionHandler</span></a></li>
<li><a href="org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction" target="classFrame"><span class="interfaceName">CDOTransactionHandler1</span></a></li>
+<li><a href="org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.WithUndo.html" title="interface in org.eclipse.emf.cdo.transaction" target="classFrame"><span class="interfaceName">CDOTransactionHandler1.WithUndo</span></a></li>
<li><a href="org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction" target="classFrame"><span class="interfaceName">CDOTransactionHandler2</span></a></li>
<li><a href="org/eclipse/emf/cdo/transaction/CDOTransactionHandler3.html" title="interface in org.eclipse.emf.cdo.transaction" target="classFrame"><span class="interfaceName">CDOTransactionHandler3</span></a></li>
<li><a href="org/eclipse/emf/cdo/transaction/CDOTransactionHandlerBase.html" title="interface in org.eclipse.emf.cdo.transaction" target="classFrame"><span class="interfaceName">CDOTransactionHandlerBase</span></a></li>
@@ -517,6 +524,7 @@
<li><a href="org/eclipse/emf/cdo/transaction/CDOUserSavepoint.html" title="interface in org.eclipse.emf.cdo.transaction" target="classFrame"><span class="interfaceName">CDOUserSavepoint</span></a></li>
<li><a href="org/eclipse/emf/cdo/transaction/CDOUserTransaction.html" title="interface in org.eclipse.emf.cdo.transaction" target="classFrame"><span class="interfaceName">CDOUserTransaction</span></a></li>
<li><a href="org/eclipse/emf/cdo/util/CDOUtil.html" title="class in org.eclipse.emf.cdo.util" target="classFrame">CDOUtil</a></li>
+<li><a href="org/eclipse/emf/cdo/common/util/CDOVersionProvider.html" title="interface in org.eclipse.emf.cdo.common.util" target="classFrame"><span class="interfaceName">CDOVersionProvider</span></a></li>
<li><a href="org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view" target="classFrame"><span class="interfaceName">CDOView</span></a></li>
<li><a href="org/eclipse/emf/cdo/view/CDOView.Options.html" title="interface in org.eclipse.emf.cdo.view" target="classFrame"><span class="interfaceName">CDOView.Options</span></a></li>
<li><a href="org/eclipse/emf/cdo/view/CDOView.Options.CacheReferenceTypeEvent.html" title="interface in org.eclipse.emf.cdo.view" target="classFrame"><span class="interfaceName">CDOView.Options.CacheReferenceTypeEvent</span></a></li>
@@ -596,6 +604,8 @@
<li><a href="org/eclipse/emf/cdo/expressions/ContextAccess.html" title="interface in org.eclipse.emf.cdo.expressions" target="classFrame"><span class="interfaceName">ContextAccess</span></a></li>
<li><a href="org/eclipse/emf/cdo/expressions/impl/ContextAccessImpl.html" title="class in org.eclipse.emf.cdo.expressions.impl" target="classFrame">ContextAccessImpl</a></li>
<li><a href="org/eclipse/emf/cdo/expressions/provider/ContextAccessItemProvider.html" title="class in org.eclipse.emf.cdo.expressions.provider" target="classFrame">ContextAccessItemProvider</a></li>
+<li><a href="org/eclipse/emf/cdo/common/util/CountedTimeProvider.html" title="class in org.eclipse.emf.cdo.common.util" target="classFrame">CountedTimeProvider</a></li>
+<li><a href="org/eclipse/emf/cdo/common/util/CurrentTimeProvider.html" title="class in org.eclipse.emf.cdo.common.util" target="classFrame">CurrentTimeProvider</a></li>
<li><a href="org/eclipse/emf/cdo/util/DanglingIntegrityException.html" title="class in org.eclipse.emf.cdo.util" target="classFrame">DanglingIntegrityException</a></li>
<li><a href="org/eclipse/emf/cdo/util/DanglingReferenceException.html" title="class in org.eclipse.emf.cdo.util" target="classFrame">DanglingReferenceException</a></li>
<li><a href="org/eclipse/emf/cdo/util/DataIntegrityException.html" title="class in org.eclipse.emf.cdo.util" target="classFrame">DataIntegrityException</a></li>
@@ -867,6 +877,7 @@
<li><a href="org/eclipse/emf/cdo/server/IStoreAccessor.QueryResourcesContext.ExactMatch.html" title="interface in org.eclipse.emf.cdo.server" target="classFrame"><span class="interfaceName">IStoreAccessor.QueryResourcesContext.ExactMatch</span></a></li>
<li><a href="org/eclipse/emf/cdo/server/IStoreAccessor.QueryXRefsContext.html" title="interface in org.eclipse.emf.cdo.server" target="classFrame"><span class="interfaceName">IStoreAccessor.QueryXRefsContext</span></a></li>
<li><a href="org/eclipse/emf/cdo/server/IStoreAccessor.Raw.html" title="interface in org.eclipse.emf.cdo.server" target="classFrame"><span class="interfaceName">IStoreAccessor.Raw</span></a></li>
+<li><a href="org/eclipse/emf/cdo/server/IStoreAccessor.Raw2.html" title="interface in org.eclipse.emf.cdo.server" target="classFrame"><span class="interfaceName">IStoreAccessor.Raw2</span></a></li>
<li><a href="org/eclipse/emf/cdo/server/IStoreAccessor.UnitSupport.html" title="interface in org.eclipse.emf.cdo.server" target="classFrame"><span class="interfaceName">IStoreAccessor.UnitSupport</span></a></li>
<li><a href="org/eclipse/emf/cdo/server/IStoreChunkReader.html" title="interface in org.eclipse.emf.cdo.server" target="classFrame"><span class="interfaceName">IStoreChunkReader</span></a></li>
<li><a href="org/eclipse/emf/cdo/server/IStoreChunkReader.Chunk.html" title="class in org.eclipse.emf.cdo.server" target="classFrame">IStoreChunkReader.Chunk</a></li>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/allclasses-noframe.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/allclasses-noframe.html
index 5ca587adad..f9fac1298b 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/allclasses-noframe.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/allclasses-noframe.html
@@ -94,6 +94,7 @@
<li><a href="org/eclipse/emf/cdo/common/branch/CDOBranchManager.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="interfaceName">CDOBranchManager</span></a></li>
<li><a href="org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="interfaceName">CDOBranchPoint</span></a></li>
<li><a href="org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="interfaceName">CDOBranchPointRange</span></a></li>
+<li><a href="org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="interfaceName">CDOBranchProvider</span></a></li>
<li><a href="org/eclipse/emf/cdo/common/branch/CDOBranchTag.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="interfaceName">CDOBranchTag</span></a></li>
<li><a href="org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html" title="class in org.eclipse.emf.cdo.spi.common.branch">CDOBranchUtil</a></li>
<li><a href="org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="interfaceName">CDOBranchVersion</span></a></li>
@@ -105,6 +106,7 @@
<li><a href="org/eclipse/emf/cdo/common/commit/CDOChangeSetDataProvider.html" title="interface in org.eclipse.emf.cdo.common.commit"><span class="interfaceName">CDOChangeSetDataProvider</span></a></li>
<li><a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetDataRevisionProvider.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDOChangeSetDataRevisionProvider</a></li>
<li><a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDOChangeSetSegment</a></li>
+<li><a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.Handler.html" title="interface in org.eclipse.emf.cdo.spi.common.commit"><span class="interfaceName">CDOChangeSetSegment.Handler</span></a></li>
<li><a href="org/eclipse/emf/spi/cdo/CDOChangeSubscriptionAdapter.html" title="class in org.eclipse.emf.spi.cdo">CDOChangeSubscriptionAdapter</a></li>
<li><a href="org/eclipse/emf/cdo/explorer/checkouts/CDOCheckout.html" title="interface in org.eclipse.emf.cdo.explorer.checkouts"><span class="interfaceName">CDOCheckout</span></a></li>
<li><a href="org/eclipse/emf/cdo/explorer/checkouts/CDOCheckout.ObjectType.html" title="enum in org.eclipse.emf.cdo.explorer.checkouts">CDOCheckout.ObjectType</a></li>
@@ -136,6 +138,7 @@
<li><a href="org/eclipse/emf/cdo/spi/common/commit/CDOCommitInfoUtil.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDOCommitInfoUtil</a></li>
<li><a href="org/eclipse/emf/cdo/common/util/CDOCommonEventAdapter.html" title="class in org.eclipse.emf.cdo.common.util">CDOCommonEventAdapter</a></li>
<li><a href="org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><span class="interfaceName">CDOCommonRepository</span></a></li>
+<li><a href="org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a></li>
<li><a href="org/eclipse/emf/cdo/common/CDOCommonRepository.IDGenerationLocation.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.IDGenerationLocation</a></li>
<li><a href="org/eclipse/emf/cdo/common/CDOCommonRepository.State.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.State</a></li>
<li><a href="org/eclipse/emf/cdo/common/CDOCommonRepository.StateChangedEvent.html" title="interface in org.eclipse.emf.cdo.common"><span class="interfaceName">CDOCommonRepository.StateChangedEvent</span></a></li>
@@ -367,6 +370,7 @@
<li><a href="org/eclipse/emf/cdo/eresource/CDOResourceNode.html" title="interface in org.eclipse.emf.cdo.eresource"><span class="interfaceName">CDOResourceNode</span></a></li>
<li><a href="org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.html" title="class in org.eclipse.emf.cdo.eresource.impl">CDOResourceNodeImpl</a></li>
<li><a href="org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.html" title="class in org.eclipse.emf.cdo.eresource.provider">CDOResourceNodeItemProvider</a></li>
+<li><a href="org/eclipse/emf/cdo/common/util/CDOResourceNodeNotFoundException.html" title="class in org.eclipse.emf.cdo.common.util">CDOResourceNodeNotFoundException</a></li>
<li><a href="org/eclipse/emf/cdo/session/CDORetryExceptionHandler.html" title="class in org.eclipse.emf.cdo.session">CDORetryExceptionHandler</a></li>
<li><a href="org/eclipse/emf/cdo/common/revision/CDORevisable.html" title="interface in org.eclipse.emf.cdo.common.revision"><span class="interfaceName">CDORevisable</span></a></li>
<li><a href="org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><span class="interfaceName">CDORevision</span></a></li>
@@ -413,6 +417,7 @@
<li><a href="org/eclipse/emf/cdo/server/CDOServerExporter.XMLConstants.html" title="interface in org.eclipse.emf.cdo.server"><span class="interfaceName">CDOServerExporter.XMLConstants</span></a></li>
<li><a href="org/eclipse/emf/cdo/server/CDOServerImporter.html" title="class in org.eclipse.emf.cdo.server">CDOServerImporter</a></li>
<li><a href="org/eclipse/emf/cdo/server/CDOServerImporter.Handler.html" title="interface in org.eclipse.emf.cdo.server"><span class="interfaceName">CDOServerImporter.Handler</span></a></li>
+<li><a href="org/eclipse/emf/cdo/server/CDOServerImporter.Handler2.html" title="interface in org.eclipse.emf.cdo.server"><span class="interfaceName">CDOServerImporter.Handler2</span></a></li>
<li><a href="org/eclipse/emf/cdo/server/CDOServerImporter.XML.html" title="class in org.eclipse.emf.cdo.server">CDOServerImporter.XML</a></li>
<li><a href="org/eclipse/emf/cdo/server/CDOServerUtil.html" title="class in org.eclipse.emf.cdo.server">CDOServerUtil</a></li>
<li><a href="org/eclipse/emf/cdo/server/CDOServerUtil.RepositoryReadAccessValidator.html" title="class in org.eclipse.emf.cdo.server">CDOServerUtil.RepositoryReadAccessValidator</a></li>
@@ -441,6 +446,7 @@
<li><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.CommitTransactionResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.CommitTransactionResult</a></li>
<li><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.CommitTransactionResult.PostCommitReferenceAdjuster.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.CommitTransactionResult.PostCommitReferenceAdjuster</a></li>
<li><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.LockObjectsResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.LockObjectsResult</a></li>
+<li><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.MergeDataResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.MergeDataResult</a></li>
<li><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.OpenSessionResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.OpenSessionResult</a></li>
<li><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.RefreshSessionResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.RefreshSessionResult</a></li>
<li><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.RefreshSessionResult.Provider.html" title="interface in org.eclipse.emf.spi.cdo"><span class="interfaceName">CDOSessionProtocol.RefreshSessionResult.Provider</span></a></li>
@@ -479,6 +485,7 @@
<li><a href="org/eclipse/emf/cdo/transaction/CDOTransactionFinishedEvent.Type.html" title="enum in org.eclipse.emf.cdo.transaction">CDOTransactionFinishedEvent.Type</a></li>
<li><a href="org/eclipse/emf/cdo/transaction/CDOTransactionHandler.html" title="interface in org.eclipse.emf.cdo.transaction"><span class="interfaceName">CDOTransactionHandler</span></a></li>
<li><a href="org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><span class="interfaceName">CDOTransactionHandler1</span></a></li>
+<li><a href="org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.WithUndo.html" title="interface in org.eclipse.emf.cdo.transaction"><span class="interfaceName">CDOTransactionHandler1.WithUndo</span></a></li>
<li><a href="org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction"><span class="interfaceName">CDOTransactionHandler2</span></a></li>
<li><a href="org/eclipse/emf/cdo/transaction/CDOTransactionHandler3.html" title="interface in org.eclipse.emf.cdo.transaction"><span class="interfaceName">CDOTransactionHandler3</span></a></li>
<li><a href="org/eclipse/emf/cdo/transaction/CDOTransactionHandlerBase.html" title="interface in org.eclipse.emf.cdo.transaction"><span class="interfaceName">CDOTransactionHandlerBase</span></a></li>
@@ -517,6 +524,7 @@
<li><a href="org/eclipse/emf/cdo/transaction/CDOUserSavepoint.html" title="interface in org.eclipse.emf.cdo.transaction"><span class="interfaceName">CDOUserSavepoint</span></a></li>
<li><a href="org/eclipse/emf/cdo/transaction/CDOUserTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><span class="interfaceName">CDOUserTransaction</span></a></li>
<li><a href="org/eclipse/emf/cdo/util/CDOUtil.html" title="class in org.eclipse.emf.cdo.util">CDOUtil</a></li>
+<li><a href="org/eclipse/emf/cdo/common/util/CDOVersionProvider.html" title="interface in org.eclipse.emf.cdo.common.util"><span class="interfaceName">CDOVersionProvider</span></a></li>
<li><a href="org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><span class="interfaceName">CDOView</span></a></li>
<li><a href="org/eclipse/emf/cdo/view/CDOView.Options.html" title="interface in org.eclipse.emf.cdo.view"><span class="interfaceName">CDOView.Options</span></a></li>
<li><a href="org/eclipse/emf/cdo/view/CDOView.Options.CacheReferenceTypeEvent.html" title="interface in org.eclipse.emf.cdo.view"><span class="interfaceName">CDOView.Options.CacheReferenceTypeEvent</span></a></li>
@@ -596,6 +604,8 @@
<li><a href="org/eclipse/emf/cdo/expressions/ContextAccess.html" title="interface in org.eclipse.emf.cdo.expressions"><span class="interfaceName">ContextAccess</span></a></li>
<li><a href="org/eclipse/emf/cdo/expressions/impl/ContextAccessImpl.html" title="class in org.eclipse.emf.cdo.expressions.impl">ContextAccessImpl</a></li>
<li><a href="org/eclipse/emf/cdo/expressions/provider/ContextAccessItemProvider.html" title="class in org.eclipse.emf.cdo.expressions.provider">ContextAccessItemProvider</a></li>
+<li><a href="org/eclipse/emf/cdo/common/util/CountedTimeProvider.html" title="class in org.eclipse.emf.cdo.common.util">CountedTimeProvider</a></li>
+<li><a href="org/eclipse/emf/cdo/common/util/CurrentTimeProvider.html" title="class in org.eclipse.emf.cdo.common.util">CurrentTimeProvider</a></li>
<li><a href="org/eclipse/emf/cdo/util/DanglingIntegrityException.html" title="class in org.eclipse.emf.cdo.util">DanglingIntegrityException</a></li>
<li><a href="org/eclipse/emf/cdo/util/DanglingReferenceException.html" title="class in org.eclipse.emf.cdo.util">DanglingReferenceException</a></li>
<li><a href="org/eclipse/emf/cdo/util/DataIntegrityException.html" title="class in org.eclipse.emf.cdo.util">DataIntegrityException</a></li>
@@ -867,6 +877,7 @@
<li><a href="org/eclipse/emf/cdo/server/IStoreAccessor.QueryResourcesContext.ExactMatch.html" title="interface in org.eclipse.emf.cdo.server"><span class="interfaceName">IStoreAccessor.QueryResourcesContext.ExactMatch</span></a></li>
<li><a href="org/eclipse/emf/cdo/server/IStoreAccessor.QueryXRefsContext.html" title="interface in org.eclipse.emf.cdo.server"><span class="interfaceName">IStoreAccessor.QueryXRefsContext</span></a></li>
<li><a href="org/eclipse/emf/cdo/server/IStoreAccessor.Raw.html" title="interface in org.eclipse.emf.cdo.server"><span class="interfaceName">IStoreAccessor.Raw</span></a></li>
+<li><a href="org/eclipse/emf/cdo/server/IStoreAccessor.Raw2.html" title="interface in org.eclipse.emf.cdo.server"><span class="interfaceName">IStoreAccessor.Raw2</span></a></li>
<li><a href="org/eclipse/emf/cdo/server/IStoreAccessor.UnitSupport.html" title="interface in org.eclipse.emf.cdo.server"><span class="interfaceName">IStoreAccessor.UnitSupport</span></a></li>
<li><a href="org/eclipse/emf/cdo/server/IStoreChunkReader.html" title="interface in org.eclipse.emf.cdo.server"><span class="interfaceName">IStoreChunkReader</span></a></li>
<li><a href="org/eclipse/emf/cdo/server/IStoreChunkReader.Chunk.html" title="class in org.eclipse.emf.cdo.server">IStoreChunkReader.Chunk</a></li>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/constant-values.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/constant-values.html
index f9ea7bc2a4..fa055c7221 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/constant-values.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/constant-values.html
@@ -631,7 +631,7 @@
<!-- -->
</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
<td><code><a href="org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.html#PROTOCOL_VERSION">PROTOCOL_VERSION</a></code></td>
-<td class="colLast"><code>32</code></td>
+<td class="colLast"><code>34</code></td>
</tr>
<tr class="rowColor">
<td class="colFirst"><a name="org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants.QUERY_LANGUAGE_INSTANCES">
@@ -4756,6 +4756,20 @@
<td class="colLast"><code>"lobs"</code></td>
</tr>
<tr class="altColor">
+<td class="colFirst"><a name="org.eclipse.emf.cdo.server.CDOServerExporter.XMLConstants.MERGE_SOURCE_BRANCH">
+<!-- -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/eclipse/emf/cdo/server/CDOServerExporter.XMLConstants.html#MERGE_SOURCE_BRANCH">MERGE_SOURCE_BRANCH</a></code></td>
+<td class="colLast"><code>"mergeSourceBranch"</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="org.eclipse.emf.cdo.server.CDOServerExporter.XMLConstants.MERGE_SOURCE_TIME">
+<!-- -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/eclipse/emf/cdo/server/CDOServerExporter.XMLConstants.html#MERGE_SOURCE_TIME">MERGE_SOURCE_TIME</a></code></td>
+<td class="colLast"><code>"mergeSourceTime"</code></td>
+</tr>
+<tr class="altColor">
<td class="colFirst"><a name="org.eclipse.emf.cdo.server.CDOServerExporter.XMLConstants.MODELS">
<!-- -->
</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
@@ -4983,62 +4997,69 @@
<td class="colLast"><code>"checkUnitMoves"</code></td>
</tr>
<tr class="altColor">
+<td class="colFirst"><a name="org.eclipse.emf.cdo.server.IRepository.Props.COMMIT_INFO_STORAGE">
+<!-- -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/eclipse/emf/cdo/server/IRepository.Props.html#COMMIT_INFO_STORAGE">COMMIT_INFO_STORAGE</a></code></td>
+<td class="colLast"><code>"commitInfoStorage"</code></td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><a name="org.eclipse.emf.cdo.server.IRepository.Props.ENSURE_REFERENTIAL_INTEGRITY">
<!-- -->
</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td><code><a href="org/eclipse/emf/cdo/server/IRepository.Props.html#ENSURE_REFERENTIAL_INTEGRITY">ENSURE_REFERENTIAL_INTEGRITY</a></code></td>
<td class="colLast"><code>"ensureReferentialIntegrity"</code></td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a name="org.eclipse.emf.cdo.server.IRepository.Props.ID_GENERATION_LOCATION">
<!-- -->
</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td><code><a href="org/eclipse/emf/cdo/server/IRepository.Props.html#ID_GENERATION_LOCATION">ID_GENERATION_LOCATION</a></code></td>
<td class="colLast"><code>"idGenerationLocation"</code></td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a name="org.eclipse.emf.cdo.server.IRepository.Props.OPTIMISTIC_LOCKING_TIMEOUT">
<!-- -->
</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td><code><a href="org/eclipse/emf/cdo/server/IRepository.Props.html#OPTIMISTIC_LOCKING_TIMEOUT">OPTIMISTIC_LOCKING_TIMEOUT</a></code></td>
<td class="colLast"><code>"optimisticLockingTimeout"</code></td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a name="org.eclipse.emf.cdo.server.IRepository.Props.OVERRIDE_UUID">
<!-- -->
</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td><code><a href="org/eclipse/emf/cdo/server/IRepository.Props.html#OVERRIDE_UUID">OVERRIDE_UUID</a></code></td>
<td class="colLast"><code>"overrideUUID"</code></td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a name="org.eclipse.emf.cdo.server.IRepository.Props.SERIALIZE_COMMITS">
<!-- -->
</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td><code><a href="org/eclipse/emf/cdo/server/IRepository.Props.html#SERIALIZE_COMMITS">SERIALIZE_COMMITS</a></code></td>
<td class="colLast"><code>"serializeCommits"</code></td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a name="org.eclipse.emf.cdo.server.IRepository.Props.SUPPORTING_AUDITS">
<!-- -->
</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td><code><a href="org/eclipse/emf/cdo/server/IRepository.Props.html#SUPPORTING_AUDITS">SUPPORTING_AUDITS</a></code></td>
<td class="colLast"><code>"supportingAudits"</code></td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a name="org.eclipse.emf.cdo.server.IRepository.Props.SUPPORTING_BRANCHES">
<!-- -->
</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td><code><a href="org/eclipse/emf/cdo/server/IRepository.Props.html#SUPPORTING_BRANCHES">SUPPORTING_BRANCHES</a></code></td>
<td class="colLast"><code>"supportingBranches"</code></td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a name="org.eclipse.emf.cdo.server.IRepository.Props.SUPPORTING_ECORE">
<!-- -->
</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td><code><a href="org/eclipse/emf/cdo/server/IRepository.Props.html#SUPPORTING_ECORE">SUPPORTING_ECORE</a></code></td>
<td class="colLast"><code>"supportingEcore"</code></td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a name="org.eclipse.emf.cdo.server.IRepository.Props.SUPPORTING_UNITS">
<!-- -->
</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
@@ -6175,6 +6196,25 @@
</tbody>
</table>
</li>
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.html" title="class in org.eclipse.emf.cdo.transaction">CDOTransactionCommentator</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="org.eclipse.emf.cdo.transaction.CDOTransactionCommentator.MERGE_PREFIX">
+<!-- -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.html#MERGE_PREFIX">MERGE_PREFIX</a></code></td>
+<td class="colLast"><code>"Merge from "</code></td>
+</tr>
+</tbody>
+</table>
+</li>
</ul>
<ul class="blockList">
<li class="blockList">
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/deprecated-list.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/deprecated-list.html
index 8d9976d3fa..9b91ff9c8c 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/deprecated-list.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/deprecated-list.html
@@ -451,6 +451,11 @@
</td>
</tr>
<tr class="rowColor">
+<td class="colOne"><a href="org/eclipse/emf/cdo/common/revision/delta/CDOSetFeatureDelta.html#UNSPECIFIED">org.eclipse.emf.cdo.common.revision.delta.CDOSetFeatureDelta.UNSPECIFIED</a>
+<div class="block"><span class="deprecationComment">As of 4.6 use <a href="org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html#UNKNOWN_VALUE"><code>CDOFeatureDelta.UNKNOWN_VALUE</code></a>.</span></div>
+</td>
+</tr>
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/Store.html#UNSPECIFIED_DATE">org.eclipse.emf.cdo.spi.server.Store.UNSPECIFIED_DATE</a>
<div class="block"><span class="deprecationComment">Use CDOBranchPoint.UNSPECIFIED_DATE</span></div>
</td>
@@ -794,6 +799,16 @@
</td>
</tr>
<tr class="rowColor">
+<td class="colOne"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getAncestor--">org.eclipse.emf.spi.cdo.InternalCDOSession.MergeData.getAncestor()</a>
+<div class="block"><span class="deprecationComment">As of 4.6 use <a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getTargetBase--"><code>InternalCDOSession.MergeData.getTargetBase()</code></a>.</span></div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getAncestorInfo--">org.eclipse.emf.spi.cdo.InternalCDOSession.MergeData.getAncestorInfo()</a>
+<div class="block"><span class="deprecationComment">As of 4.6 use <a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getTargetBaseInfo--"><code>InternalCDOSession.MergeData.getTargetBaseInfo()</code></a>.</span></div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/server/ocl/OCLQueryHandler.html#getArbitraryContextClassifier-org.eclipse.emf.cdo.common.model.CDOPackageRegistry-">org.eclipse.emf.cdo.server.ocl.OCLQueryHandler.getArbitraryContextClassifier(CDOPackageRegistry)</a>
<div class="block"><span class="deprecationComment">As of 4.2 no longer supported.</span></div>
</td>
@@ -809,54 +824,64 @@
</td>
</tr>
<tr class="altColor">
+<td class="colOne"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getBaseInfo--">org.eclipse.emf.spi.cdo.InternalCDOSession.MergeData.getBaseInfo()</a>
+<div class="block"><span class="deprecationComment">As of 4.6 use <a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getSourceBaseInfo--"><code>InternalCDOSession.MergeData.getSourceBaseInfo()</code></a>.</span></div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/spi/cdo/CDOSessionInvalidationEventQueue.html#getChangeSetData--">org.eclipse.emf.spi.cdo.CDOSessionInvalidationEventQueue.getChangeSetData()</a>
<div class="block"><span class="deprecationComment">As of 4.3 use <a href="org/eclipse/emf/spi/cdo/CDOSessionInvalidationEventQueue.html#poll--"><code>CDOSessionInvalidationEventQueue.poll()</code></a>.</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/server/IRepository.html#getCommitInfoHandlers--">org.eclipse.emf.cdo.server.IRepository.getCommitInfoHandlers()</a>
<div class="block"><span class="deprecationComment">As of 4.2 call <a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfoProvider.html#getCommitInfoHandlers--"><code>CDOCommitInfoProvider.getCommitInfoHandlers()</code></a></span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.html#getEObjectToIDMap--">org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl.getEObjectToIDMap()</a></td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/spi/cdo/InternalCDOView.html#getFeatureAnalyzer--">org.eclipse.emf.spi.cdo.InternalCDOView.getFeatureAnalyzer()</a></td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/common/model/CDOClassInfo.html#getFeatureIndex-org.eclipse.emf.ecore.EStructuralFeature-">org.eclipse.emf.cdo.common.model.CDOClassInfo.getFeatureIndex(EStructuralFeature)</a>
<div class="block"><span class="deprecationComment">As of 4.2 pushed down to <a href="org/eclipse/emf/cdo/spi/common/model/InternalCDOClassInfo.html#getPersistentFeatureIndex-org.eclipse.emf.ecore.EStructuralFeature-"><code>InternalCDOClassInfo.getPersistentFeatureIndex(EStructuralFeature)</code></a>.</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/common/model/CDOClassInfo.html#getFeatureIndex-int-">org.eclipse.emf.cdo.common.model.CDOClassInfo.getFeatureIndex(int)</a>
<div class="block"><span class="deprecationComment">As of 4.2 pushed down to <a href="org/eclipse/emf/cdo/spi/common/model/InternalCDOClassInfo.html#getPersistentFeatureIndex-int-"><code>InternalCDOClassInfo.getPersistentFeatureIndex(int)</code></a>.</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.html#getIDToEObjectMap--">org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl.getIDToEObjectMap()</a></td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/server/ISession.html#getLastUpdateTime--">org.eclipse.emf.cdo.server.ISession.getLastUpdateTime()</a>
<div class="block"><span class="deprecationComment">The return value of this method can not be relied upon to be strictly ordered!</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/server/IRepository.html#getLockManager--">org.eclipse.emf.cdo.server.IRepository.getLockManager()</a>
<div class="block"><span class="deprecationComment">As of 4.1 use <a href="org/eclipse/emf/cdo/server/IRepository.html#getLockingManager--"><code>IRepository.getLockingManager()</code></a>.</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/InternalRepository.html#getLockManager--">org.eclipse.emf.cdo.spi.server.InternalRepository.getLockManager()</a>
<div class="block"><span class="deprecationComment">As of 4.1 use <a href="org/eclipse/emf/cdo/spi/server/InternalRepository.html#getLockingManager--"><code>InternalRepository.getLockingManager()</code></a>.</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#getLockStates-int-java.util.Collection-">org.eclipse.emf.spi.cdo.CDOSessionProtocol.getLockStates(int, Collection&lt;CDOID&gt;)</a>
<div class="block"><span class="deprecationComment">Not called anymore. Use <a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#getLockStates-int-java.util.Collection-int-"><code>CDOSessionProtocol.getLockStates(int, Collection, int)</code></a> instead.</span></div>
</td>
</tr>
+<tr class="altColor">
+<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/InternalRepository.html#getMergeData-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.net4j.util.om.monitor.OMMonitor-">org.eclipse.emf.cdo.spi.server.InternalRepository.getMergeData(CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, OMMonitor)</a>
+<div class="block"><span class="deprecationComment">as of 4.6 use <a href="org/eclipse/emf/cdo/spi/server/InternalRepository.html#getMergeData2-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.net4j.util.om.monitor.OMMonitor-"><code>InternalRepository.getMergeData2(CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, OMMonitor)</code></a>.</span></div>
+</td>
+</tr>
<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/spi/cdo/InternalCDOTransaction.html#getNextTemporaryID--">org.eclipse.emf.spi.cdo.InternalCDOTransaction.getNextTemporaryID()</a>
<div class="block"><span class="deprecationComment"><a href="org/eclipse/emf/spi/cdo/InternalCDOTransaction.html#createIDForNewObject-org.eclipse.emf.ecore.EObject-"><code>InternalCDOTransaction.createIDForNewObject(EObject)</code></a> is called since 4.1.</span></div>
@@ -1132,269 +1157,279 @@
</td>
</tr>
<tr class="rowColor">
-<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/InternalLockManager.html#lock-boolean-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-org.eclipse.emf.cdo.server.IView-java.util.Collection-long-">org.eclipse.emf.cdo.spi.server.InternalLockManager.lock(boolean, IRWLockManager.LockType, IView, Collection&lt;? extends Object&gt;, long)</a></td>
+<td class="colOne"><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#loadMergeData-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-">org.eclipse.emf.spi.cdo.CDOSessionProtocol.loadMergeData(CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo)</a>
+<div class="block"><span class="deprecationComment">As of 4.6 use <a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#loadMergeData2-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-"><code>CDOSessionProtocol.loadMergeData2(CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo)</code></a>.</span></div>
+</td>
</tr>
<tr class="altColor">
+<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/InternalLockManager.html#lock-boolean-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-org.eclipse.emf.cdo.server.IView-java.util.Collection-long-">org.eclipse.emf.cdo.spi.server.InternalLockManager.lock(boolean, IRWLockManager.LockType, IView, Collection&lt;? extends Object&gt;, long)</a></td>
+</tr>
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#lockObjects-java.util.List-int-org.eclipse.emf.cdo.common.branch.CDOBranch-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-long-">org.eclipse.emf.spi.cdo.CDOSessionProtocol.lockObjects(List&lt;InternalCDORevision&gt;, int, CDOBranch, IRWLockManager.LockType, long)</a>
<div class="block"><span class="deprecationComment">Not called anymore. Use <code>#lockObjects2(List, int, CDOBranch, LockType, boolean, long)</code> instead.</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/transaction/CDOMerger2.html#merge-org.eclipse.emf.cdo.common.commit.CDOChangeSet-org.eclipse.emf.cdo.common.commit.CDOChangeSet-">org.eclipse.emf.cdo.transaction.CDOMerger2.merge(CDOChangeSet, CDOChangeSet)</a></td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/workspace/CDOWorkspaceUtil.html#open-org.eclipse.emf.cdo.server.IStore-org.eclipse.emf.cdo.workspace.CDOWorkspaceBase-org.eclipse.emf.cdo.session.CDOSessionConfigurationFactory-">org.eclipse.emf.cdo.workspace.CDOWorkspaceUtil.open(IStore, CDOWorkspaceBase, CDOSessionConfigurationFactory)</a>
<div class="block"><span class="deprecationComment">Use <a href="org/eclipse/emf/cdo/workspace/CDOWorkspaceUtil.html#createWorkspaceConfiguration--"><code>CDOWorkspaceUtil.createWorkspaceConfiguration()</code></a> and <a href="org/eclipse/emf/cdo/workspace/CDOWorkspaceConfiguration.html#open--"><code>CDOWorkspaceConfiguration.open()</code></a></span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/net4j/CDONet4jSessionConfiguration.html#openSession--">org.eclipse.emf.cdo.net4j.CDONet4jSessionConfiguration.openSession()</a>
<div class="block"><span class="deprecationComment">Use <a href="org/eclipse/emf/cdo/net4j/CDONet4jSessionConfiguration.html#openNet4jSession--"><code>openNet4jSession()</code></a>.</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/server/CDOServerUtil.html#openView-org.eclipse.emf.cdo.server.ISession-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-boolean-">org.eclipse.emf.cdo.server.CDOServerUtil.openView(ISession, CDOBranchPoint, boolean)</a>
<div class="block"><span class="deprecationComment">As of 4.2 the legacy mode is always enabled, use <a href="org/eclipse/emf/cdo/server/CDOServerUtil.html#openView-org.eclipse.emf.cdo.server.ISession-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-"><code>CDOServerUtil.openView(ISession, CDOBranchPoint)</code></a>.</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/server/CDOServerUtil.html#openView-org.eclipse.emf.cdo.server.ISession-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-boolean-org.eclipse.emf.cdo.common.revision.CDORevisionProvider-">org.eclipse.emf.cdo.server.CDOServerUtil.openView(ISession, CDOBranchPoint, boolean, CDORevisionProvider)</a>
<div class="block"><span class="deprecationComment">As of 4.2 the legacy mode is always enabled, use <a href="org/eclipse/emf/cdo/server/CDOServerUtil.html#openView-org.eclipse.emf.cdo.server.ISession-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.revision.CDORevisionProvider-"><code>CDOServerUtil.openView(ISession, CDOBranchPoint, CDORevisionProvider)</code></a>.</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/server/CDOServerUtil.html#openView-org.eclipse.emf.cdo.server.IStoreAccessor.CommitContext-boolean-">org.eclipse.emf.cdo.server.CDOServerUtil.openView(IStoreAccessor.CommitContext, boolean)</a>
<div class="block"><span class="deprecationComment">As of 4.2 the legacy mode is always enabled, use <a href="org/eclipse/emf/cdo/server/CDOServerUtil.html#openView-org.eclipse.emf.cdo.server.IStoreAccessor.CommitContext-"><code>CDOServerUtil.openView(IStoreAccessor.CommitContext)</code></a>.</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/server/CDOServerUtil.html#openView-org.eclipse.emf.cdo.server.IView-boolean-">org.eclipse.emf.cdo.server.CDOServerUtil.openView(IView, boolean)</a>
<div class="block"><span class="deprecationComment">As of 4.2 the legacy mode is always enabled, use <a href="org/eclipse/emf/cdo/server/CDOServerUtil.html#openView-org.eclipse.emf.cdo.server.IView-"><code>CDOServerUtil.openView(IView)</code></a>.</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/net4j/CDOSession.html#options--">org.eclipse.emf.cdo.net4j.CDOSession.options()</a>
<div class="block"><span class="deprecationComment">Use <a href="org/eclipse/emf/cdo/net4j/CDONet4jSession.html#options--"><code>CDONet4jSession.options()</code></a>.</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/InternalCommitManager.html#preCommit-org.eclipse.emf.cdo.spi.server.InternalCommitContext-org.eclipse.net4j.util.om.monitor.OMMonitor-">org.eclipse.emf.cdo.spi.server.InternalCommitManager.preCommit(InternalCommitContext, OMMonitor)</a>
<div class="block"><span class="deprecationComment">As of 4.5 use <a href="org/eclipse/emf/cdo/spi/server/InternalCommitManager.html#preCommit-org.eclipse.emf.cdo.spi.server.InternalCommitContext-org.eclipse.emf.cdo.common.protocol.CDODataInput-org.eclipse.net4j.util.om.monitor.OMMonitor-"><code>InternalCommitManager.preCommit(InternalCommitContext, CDODataInput, OMMonitor)</code></a>.</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/view/CDOViewProviderRegistry.html#provideViewWithInfo-org.eclipse.emf.common.util.URI-org.eclipse.emf.ecore.resource.ResourceSet-">org.eclipse.emf.cdo.view.CDOViewProviderRegistry.provideViewWithInfo(URI, ResourceSet)</a>
<div class="block"><span class="deprecationComment">As of 4.4. use <a href="org/eclipse/emf/cdo/view/CDOViewProviderRegistry.html#provideView-org.eclipse.emf.common.util.URI-org.eclipse.emf.ecore.resource.ResourceSet-"><code>CDOViewProviderRegistry.provideView(URI, ResourceSet)</code></a>.getProvider().</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/common/id/CDOIDUtil.html#read-org.eclipse.net4j.util.io.ExtendedDataInput-">org.eclipse.emf.cdo.common.id.CDOIDUtil.read(ExtendedDataInput)</a>
<div class="block"><span class="deprecationComment">As of 4.2 use <a href="org/eclipse/emf/cdo/common/id/CDOIDUtil.html#read-org.eclipse.emf.cdo.common.protocol.CDODataInput-"><code>CDOIDUtil.read(CDODataInput)</code></a>.</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/common/id/AbstractCDOID.html#read-org.eclipse.net4j.util.io.ExtendedDataInput-">org.eclipse.emf.cdo.spi.common.id.AbstractCDOID.read(ExtendedDataInput)</a>
<div class="block"><span class="deprecationComment">As of 4.2 not called anymore.</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/common/id/AbstractCDOID.html#read-java.lang.String-">org.eclipse.emf.cdo.spi.common.id.AbstractCDOID.read(String)</a>
<div class="block"><span class="deprecationComment">As of 4.2 not called anymore.</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/spi/cdo/InternalCDOSavepoint.html#recalculateSharedDetachedObjects--">org.eclipse.emf.spi.cdo.InternalCDOSavepoint.recalculateSharedDetachedObjects()</a></td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/spi/cdo/InternalCDOView.html#registerProxyResource-org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl-">org.eclipse.emf.spi.cdo.InternalCDOView.registerProxyResource(CDOResourceImpl)</a>
<div class="block"><span class="deprecationComment">No longer supported.</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#reload-org.eclipse.emf.cdo.CDOObject...-">org.eclipse.emf.cdo.transaction.CDOPushTransaction.reload(CDOObject...)</a></td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/view/CDOView.html#reload-org.eclipse.emf.cdo.CDOObject...-">org.eclipse.emf.cdo.view.CDOView.reload(CDOObject...)</a>
<div class="block"><span class="deprecationComment">As of 4.3 no longer supported because it is unsafe to reload single objects.</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/server/IRepository.html#removeCommitInfoHandler-org.eclipse.emf.cdo.common.commit.CDOCommitInfoHandler-">org.eclipse.emf.cdo.server.IRepository.removeCommitInfoHandler(CDOCommitInfoHandler)</a>
<div class="block"><span class="deprecationComment">As of 4.2 call <a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfoProvider.html#removeCommitInfoHandler-org.eclipse.emf.cdo.common.commit.CDOCommitInfoHandler-"><code>CDOCommitInfoProvider.removeCommitInfoHandler(CDOCommitInfoHandler)</code></a></span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/common/branch/CDOBranch.html#rename-java.lang.String-">org.eclipse.emf.cdo.common.branch.CDOBranch.rename(String)</a>
<div class="block"><span class="deprecationComment">as of 4.4 use <a href="org/eclipse/emf/cdo/common/branch/CDOBranch.html#setName-java.lang.String-"><code>CDOBranch.setName(String)</code></a>.</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.html#renameBranch-org.eclipse.emf.cdo.common.branch.CDOBranch-java.lang.String-">org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranchManager.renameBranch(CDOBranch, String)</a>
<div class="block"><span class="deprecationComment">as of 4.4 use <a href="org/eclipse/emf/cdo/common/branch/CDOBranch.html#setName-java.lang.String-"><code>CDOBranch.setName(String)</code></a>.</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.BranchLoader2.html#renameBranch-int-java.lang.String-">org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranchManager.BranchLoader2.renameBranch(int, String)</a>
<div class="block"><span class="deprecationComment">as of 4.4. use <a href="org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.BranchLoader3.html#renameBranch-int-java.lang.String-java.lang.String-"><code>InternalCDOBranchManager.BranchLoader3.renameBranch(int, String, String)</code></a>.</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/view/CDOViewSet.html#resolveView-java.lang.String-">org.eclipse.emf.cdo.view.CDOViewSet.resolveView(String)</a>
<div class="block"><span class="deprecationComment">As of 4.4 use <a href="org/eclipse/emf/cdo/view/CDOViewSet.html#resolveView-org.eclipse.emf.common.util.URI-"><code>CDOViewSet.resolveView(URI)</code></a>.</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/spi/cdo/InternalCDOViewSet.html#resolveView-java.lang.String-">org.eclipse.emf.spi.cdo.InternalCDOViewSet.resolveView(String)</a></td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.html#rollbackObject-org.eclipse.emf.cdo.CDOObject-">org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver.rollbackObject(CDOObject)</a>
<div class="block"><span class="deprecationComment">Don't call this method. Rolling back single objects is exremely risky.</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/ISessionProtocol.html#sendAuthenticationChallenge-byte:A-">org.eclipse.emf.cdo.spi.server.ISessionProtocol.sendAuthenticationChallenge(byte[])</a>
<div class="block"><span class="deprecationComment">As of 4.2 <code>#sendAuthenticationChallenge(Challenge)</code> is called.</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/ISessionProtocol.html#sendBranchNotification-org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranch-">org.eclipse.emf.cdo.spi.server.ISessionProtocol.sendBranchNotification(InternalCDOBranch)</a>
<div class="block"><span class="deprecationComment">As of 4.3 use <code>#sendBranchNotification(InternalCDOBranch, ChangeKind)</code>.</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/InternalSession.html#sendBranchNotification-org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranch-">org.eclipse.emf.cdo.spi.server.InternalSession.sendBranchNotification(InternalCDOBranch)</a>
<div class="block"><span class="deprecationComment">As of 4.3 use <code>#sendBranchNotification(InternalCDOBranch, ChangeKind)</code>.</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/InternalSessionManager.html#sendBranchNotification-org.eclipse.emf.cdo.spi.server.InternalSession-org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranch-">org.eclipse.emf.cdo.spi.server.InternalSessionManager.sendBranchNotification(InternalSession, InternalCDOBranch)</a>
<div class="block"><span class="deprecationComment">As of 4.3 use <code>#sendBranchNotification(InternalSession, InternalCDOBranch, ChangeKind)</code>.</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/ISessionProtocol.html#sendCommitNotification-org.eclipse.emf.cdo.common.commit.CDOCommitInfo-">org.eclipse.emf.cdo.spi.server.ISessionProtocol.sendCommitNotification(CDOCommitInfo)</a>
<div class="block"><span class="deprecationComment">As of 4.2 use <a href="org/eclipse/emf/cdo/spi/server/ISessionProtocol.html#sendCommitNotification-org.eclipse.emf.cdo.common.commit.CDOCommitInfo-boolean-"><code>ISessionProtocol.sendCommitNotification(CDOCommitInfo, boolean)</code></a>.</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/InternalSession.html#sendCommitNotification-org.eclipse.emf.cdo.common.commit.CDOCommitInfo-">org.eclipse.emf.cdo.spi.server.InternalSession.sendCommitNotification(CDOCommitInfo)</a>
<div class="block"><span class="deprecationComment">As of 4.2 use <a href="org/eclipse/emf/cdo/spi/server/InternalSession.html#sendCommitNotification-org.eclipse.emf.cdo.common.commit.CDOCommitInfo-boolean-"><code>InternalSession.sendCommitNotification(CDOCommitInfo, boolean)</code></a>.</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/ISessionProtocol.html#sendCommitNotification-org.eclipse.emf.cdo.common.commit.CDOCommitInfo-boolean-">org.eclipse.emf.cdo.spi.server.ISessionProtocol.sendCommitNotification(CDOCommitInfo, boolean)</a>
<div class="block"><span class="deprecationComment">As of 4.3 use <code>#sendCommitNotification(CommitNotificationInfo)</code>.</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/InternalSession.html#sendCommitNotification-org.eclipse.emf.cdo.common.commit.CDOCommitInfo-boolean-">org.eclipse.emf.cdo.spi.server.InternalSession.sendCommitNotification(CDOCommitInfo, boolean)</a>
<div class="block"><span class="deprecationComment">As of 4.3 use <code>#sendCommitNotification(CommitNotificationInfo)</code>.</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/InternalRepository.html#sendCommitNotification-org.eclipse.emf.cdo.spi.server.InternalSession-org.eclipse.emf.cdo.common.commit.CDOCommitInfo-">org.eclipse.emf.cdo.spi.server.InternalRepository.sendCommitNotification(InternalSession, CDOCommitInfo)</a>
<div class="block"><span class="deprecationComment">As of 4.2 use <a href="org/eclipse/emf/cdo/spi/server/InternalRepository.html#sendCommitNotification-org.eclipse.emf.cdo.spi.server.InternalSession-org.eclipse.emf.cdo.common.commit.CDOCommitInfo-boolean-"><code>InternalRepository.sendCommitNotification(InternalSession, CDOCommitInfo, boolean)</code></a>.</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/InternalSessionManager.html#sendCommitNotification-org.eclipse.emf.cdo.spi.server.InternalSession-org.eclipse.emf.cdo.common.commit.CDOCommitInfo-">org.eclipse.emf.cdo.spi.server.InternalSessionManager.sendCommitNotification(InternalSession, CDOCommitInfo)</a>
<div class="block"><span class="deprecationComment">As of 4.2 use <a href="org/eclipse/emf/cdo/spi/server/InternalSessionManager.html#sendCommitNotification-org.eclipse.emf.cdo.spi.server.InternalSession-org.eclipse.emf.cdo.common.commit.CDOCommitInfo-boolean-"><code>InternalSessionManager.sendCommitNotification(InternalSession, CDOCommitInfo, boolean)</code></a>.</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/InternalRepository.html#sendCommitNotification-org.eclipse.emf.cdo.spi.server.InternalSession-org.eclipse.emf.cdo.common.commit.CDOCommitInfo-boolean-">org.eclipse.emf.cdo.spi.server.InternalRepository.sendCommitNotification(InternalSession, CDOCommitInfo, boolean)</a>
<div class="block"><span class="deprecationComment">As of 4.3 use <code>#sendCommitNotification(ISessionProtocol.CommitNotificationInfo)</code>.</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/InternalSessionManager.html#sendCommitNotification-org.eclipse.emf.cdo.spi.server.InternalSession-org.eclipse.emf.cdo.common.commit.CDOCommitInfo-boolean-">org.eclipse.emf.cdo.spi.server.InternalSessionManager.sendCommitNotification(InternalSession, CDOCommitInfo, boolean)</a>
<div class="block"><span class="deprecationComment">As of 4.3 use <code>#sendCommitNotification(ISessionProtocol.CommitNotificationInfo)</code>.</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/ISessionProtocol.html#sendRepositoryStateNotification-org.eclipse.emf.cdo.common.CDOCommonRepository.State-org.eclipse.emf.cdo.common.CDOCommonRepository.State-">org.eclipse.emf.cdo.spi.server.ISessionProtocol.sendRepositoryStateNotification(CDOCommonRepository.State, CDOCommonRepository.State)</a>&nbsp;</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/InternalSession.html#sendRepositoryStateNotification-org.eclipse.emf.cdo.common.CDOCommonRepository.State-org.eclipse.emf.cdo.common.CDOCommonRepository.State-">org.eclipse.emf.cdo.spi.server.InternalSession.sendRepositoryStateNotification(CDOCommonRepository.State, CDOCommonRepository.State)</a>
<div class="block"><span class="deprecationComment">use
<a href="org/eclipse/emf/cdo/spi/server/InternalSession.html#sendRepositoryStateNotification-org.eclipse.emf.cdo.common.CDOCommonRepository.State-org.eclipse.emf.cdo.common.CDOCommonRepository.State-org.eclipse.emf.cdo.common.id.CDOID-"><code>InternalSession.sendRepositoryStateNotification(org.eclipse.emf.cdo.common.CDOCommonRepository.State, org.eclipse.emf.cdo.common.CDOCommonRepository.State, CDOID)</code></a>
instead</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/InternalSessionManager.html#sendRepositoryStateNotification-org.eclipse.emf.cdo.common.CDOCommonRepository.State-org.eclipse.emf.cdo.common.CDOCommonRepository.State-">org.eclipse.emf.cdo.spi.server.InternalSessionManager.sendRepositoryStateNotification(CDOCommonRepository.State, CDOCommonRepository.State)</a>
<div class="block"><span class="deprecationComment">use
<a href="org/eclipse/emf/cdo/spi/server/InternalSessionManager.html#sendRepositoryStateNotification-org.eclipse.emf.cdo.common.CDOCommonRepository.State-org.eclipse.emf.cdo.common.CDOCommonRepository.State-org.eclipse.emf.cdo.common.id.CDOID-"><code>InternalSessionManager.sendRepositoryStateNotification(org.eclipse.emf.cdo.common.CDOCommonRepository.State, org.eclipse.emf.cdo.common.CDOCommonRepository.State, CDOID)</code></a>
instead</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.html#setAuthenticator-org.eclipse.emf.cdo.common.protocol.CDOAuthenticator-">org.eclipse.emf.spi.cdo.InternalCDOSession.setAuthenticator(CDOAuthenticator)</a>
<div class="block"><span class="deprecationComment">As of 4.2 use <a href="org/eclipse/emf/spi/cdo/InternalCDOSession.html#setCredentialsProvider-org.eclipse.net4j.util.security.IPasswordCredentialsProvider-"><code>InternalCDOSession.setCredentialsProvider(IPasswordCredentialsProvider)</code></a></span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/InternalCommitContext.html#setAutoReleaseLocksEnabled-boolean-">org.eclipse.emf.cdo.spi.server.InternalCommitContext.setAutoReleaseLocksEnabled(boolean)</a>
<div class="block"><span class="deprecationComment">As of 4.5 no longer supported. See <a href="org/eclipse/emf/cdo/spi/server/InternalCommitContext.html#setIDsToUnlock-org.eclipse.emf.cdo.common.id.CDOID:A-"><code>InternalCommitContext.setIDsToUnlock(CDOID[])</code></a>.</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/spi/cdo/InternalCDOView.html#setFeatureAnalyzer-org.eclipse.emf.cdo.view.CDOFeatureAnalyzer-">org.eclipse.emf.spi.cdo.InternalCDOView.setFeatureAnalyzer(CDOFeatureAnalyzer)</a></td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/util/CDOUtil.html#setLegacyModeDefault-boolean-">org.eclipse.emf.cdo.util.CDOUtil.setLegacyModeDefault(boolean)</a>
<div class="block"><span class="deprecationComment">As of 4.2 the legacy mode is always enabled.</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/view/CDOView.Options.html#setStaleReferenceBehaviour-org.eclipse.emf.cdo.view.CDOStaleReferencePolicy-">org.eclipse.emf.cdo.view.CDOView.Options.setStaleReferenceBehaviour(CDOStaleReferencePolicy)</a>
<div class="block"><span class="deprecationComment">Use <a href="org/eclipse/emf/cdo/view/CDOView.Options.html#setStaleReferencePolicy-org.eclipse.emf.cdo.view.CDOStaleReferencePolicy-"><code>CDOView.Options.setStaleReferencePolicy(CDOStaleReferencePolicy)</code></a></span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.html#setTimeProvider-org.eclipse.emf.cdo.common.util.CDOTimeProvider-">org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranchManager.setTimeProvider(CDOTimeProvider)</a>
<div class="block"><span class="deprecationComment">As of 4.2 replaced by <a href="org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.html#setRepository-org.eclipse.emf.cdo.common.CDOCommonRepository-"><code>InternalCDOBranchManager.setRepository(CDOCommonRepository)</code></a></span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/InternalSessionManager.html#setUserManager-org.eclipse.net4j.util.security.IUserManager-">org.eclipse.emf.cdo.spi.server.InternalSessionManager.setUserManager(IUserManager)</a>
<div class="block"><span class="deprecationComment">As of 4.2 use <a href="org/eclipse/emf/cdo/server/ISessionManager.html#setAuthenticator-org.eclipse.net4j.util.security.IAuthenticator-"><code>ISessionManager.setAuthenticator(IAuthenticator)</code></a></span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/InternalLockManager.html#unlock-boolean-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-org.eclipse.emf.cdo.server.IView-java.util.Collection-">org.eclipse.emf.cdo.spi.server.InternalLockManager.unlock(boolean, IRWLockManager.LockType, IView, Collection&lt;? extends Object&gt;)</a></td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/InternalLockManager.html#unlock-boolean-org.eclipse.emf.cdo.server.IView-">org.eclipse.emf.cdo.spi.server.InternalLockManager.unlock(boolean, IView)</a></td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#unlockObjects-org.eclipse.emf.cdo.view.CDOView-java.util.Collection-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-">org.eclipse.emf.spi.cdo.CDOSessionProtocol.unlockObjects(CDOView, Collection&lt;CDOID&gt;, IRWLockManager.LockType)</a>
<div class="block"><span class="deprecationComment">Not called anymore. Use <code>#unlockObjects2(CDOView, Collection, LockType, boolean)</code> instead.</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/workspace/InternalCDOWorkspaceBase.html#updateAfterCommit-org.eclipse.emf.cdo.transaction.CDOTransaction-">org.eclipse.emf.cdo.spi.workspace.InternalCDOWorkspaceBase.updateAfterCommit(CDOTransaction)</a></td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/common/lock/InternalCDOLockState.html#updateFrom-java.lang.Object-org.eclipse.emf.cdo.common.lock.CDOLockState-">org.eclipse.emf.cdo.spi.common.lock.InternalCDOLockState.updateFrom(Object, CDOLockState)</a>
<div class="block"><span class="deprecationComment">As of 4.5 use <a href="org/eclipse/emf/cdo/spi/common/lock/InternalCDOLockState.html#updateFrom-org.eclipse.emf.cdo.common.lock.CDOLockState-"><code>InternalCDOLockState.updateFrom(CDOLockState)</code></a> instead.
The lockedObject field cannot be changed because it is used to compute the hash code.
Instantiate a new <a href="org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock"><code>CDOLockState</code></a> object if you want to update the lockedObject field.</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/util/CDOURIUtil.html#validateURI-org.eclipse.emf.common.util.URI-">org.eclipse.emf.cdo.util.CDOURIUtil.validateURI(URI)</a>&nbsp;</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/common/id/AbstractCDOID.html#write-org.eclipse.net4j.util.io.ExtendedDataOutput-">org.eclipse.emf.cdo.spi.common.id.AbstractCDOID.write(ExtendedDataOutput)</a>
<div class="block"><span class="deprecationComment">As of 4.2 <a href="org/eclipse/emf/cdo/spi/common/id/AbstractCDOID.html#write-org.eclipse.emf.cdo.common.protocol.CDODataOutput-"><code>AbstractCDOID.write(CDODataOutput)</code></a> is called.</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/common/id/CDOIDUtil.html#write-org.eclipse.net4j.util.io.ExtendedDataOutput-org.eclipse.emf.cdo.common.id.CDOID-">org.eclipse.emf.cdo.common.id.CDOIDUtil.write(ExtendedDataOutput, CDOID)</a>
<div class="block"><span class="deprecationComment">As of 4.2 use <a href="org/eclipse/emf/cdo/common/id/CDOIDUtil.html#write-org.eclipse.emf.cdo.common.protocol.CDODataOutput-org.eclipse.emf.cdo.common.id.CDOID-"><code>CDOIDUtil.write(CDODataOutput, CDOID)</code></a>.</span></div>
</td>
</tr>
+<tr class="altColor">
+<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/StoreAccessor.html#writeCommitInfo-org.eclipse.emf.cdo.common.branch.CDOBranch-long-long-java.lang.String-java.lang.String-org.eclipse.net4j.util.om.monitor.OMMonitor-">org.eclipse.emf.cdo.spi.server.StoreAccessor.writeCommitInfo(CDOBranch, long, long, String, String, OMMonitor)</a>
+<div class="block"><span class="deprecationComment">As of 4.6 override <a href="org/eclipse/emf/cdo/spi/server/StoreAccessor.html#writeCommitInfo-org.eclipse.emf.cdo.common.branch.CDOBranch-long-long-java.lang.String-java.lang.String-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.net4j.util.om.monitor.OMMonitor-"><code>StoreAccessor.writeCommitInfo(CDOBranch, long, long, String, String, CDOBranchPoint, OMMonitor)</code></a>.</span></div>
+</td>
+</tr>
<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.html#writeResult-org.eclipse.emf.cdo.common.protocol.CDODataOutput-int-">org.eclipse.emf.cdo.spi.common.revision.RevisionInfo.writeResult(CDODataOutput, int)</a>
<div class="block"><span class="deprecationComment">Not called anymore by the framework</span></div>
@@ -1459,11 +1494,16 @@
<td class="colOne"><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.LockObjectsResult.html#LockObjectsResult-boolean-boolean-boolean-long-org.eclipse.emf.cdo.common.revision.CDORevisionKey:A-">org.eclipse.emf.spi.cdo.CDOSessionProtocol.LockObjectsResult(boolean, boolean, boolean, long, CDORevisionKey[])</a></td>
</tr>
<tr class="rowColor">
+<td class="colOne"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#MergeData-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-java.util.Set-org.eclipse.emf.cdo.common.commit.CDOChangeSet-org.eclipse.emf.cdo.common.commit.CDOChangeSet-">org.eclipse.emf.spi.cdo.InternalCDOSession.MergeData(CDOBranchPoint, CDOBranchPoint, CDOBranchPoint, CDOBranchPoint, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, Set&lt;CDOID&gt;, CDOChangeSet, CDOChangeSet)</a>
+<div class="block"><span class="deprecationComment">As of 4.6 use <code>#MergeData(CDOBranchPoint, CDORevisionAvailabilityInfo, CDOBranchPoint, CDORevisionAvailabilityInfo, Set, CDOChangeSet, CDOBranchPoint, CDORevisionAvailabilityInfo, CDOBranchPoint, CDORevisionAvailabilityInfo, Set, CDOChangeSet, CDOBranchPoint)</code>.</span></div>
+</td>
+</tr>
+<tr class="altColor">
<td class="colOne"><a href="org/eclipse/emf/cdo/spi/server/ObjectWriteAccessHandler.html#ObjectWriteAccessHandler-boolean-">org.eclipse.emf.cdo.spi.server.ObjectWriteAccessHandler(boolean)</a>
<div class="block"><span class="deprecationComment">As of 4.2 the legacy mode is always enabled.</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.OpenSessionResult.html#OpenSessionResult-int-java.lang.String-java.lang.String-org.eclipse.emf.cdo.common.CDOCommonRepository.Type-org.eclipse.emf.cdo.common.CDOCommonRepository.State-java.lang.String-java.util.Set-long-long-org.eclipse.emf.cdo.common.id.CDOID-boolean-boolean-boolean-boolean-org.eclipse.emf.cdo.common.CDOCommonRepository.IDGenerationLocation-">org.eclipse.emf.spi.cdo.CDOSessionProtocol.OpenSessionResult(int, String, String, CDOCommonRepository.Type, CDOCommonRepository.State, String, Set&lt;CDOID.ObjectType&gt;, long, long, CDOID, boolean, boolean, boolean, boolean, CDOCommonRepository.IDGenerationLocation)</a>
<div class="block"><span class="deprecationComment">as of 4.4 use <code>#OpenSessionResult(CDODataInput, int)</code>.</span></div>
</td>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/index-all.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/index-all.html
index e4d98e67f1..093b25fe19 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/index-all.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/index-all.html
@@ -1115,8 +1115,12 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/db/IIDHandler.html#appendCDOID-java.lang.StringBuilder-org.eclipse.emf.cdo.common.id.CDOID-">appendCDOID(StringBuilder, CDOID)</a></span> - Method in interface org.eclipse.emf.cdo.server.db.<a href="org/eclipse/emf/cdo/server/db/IIDHandler.html" title="interface in org.eclipse.emf.cdo.server.db">IIDHandler</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.html#appendMerge-java.lang.StringBuilder-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">appendMerge(StringBuilder, CDOBranchPoint)</a></span> - Static method in class org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.html" title="class in org.eclipse.emf.cdo.transaction">CDOTransactionCommentator</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.html#appendSummary-java.lang.StringBuilder-org.eclipse.emf.cdo.transaction.CDOCommitContext-">appendSummary(StringBuilder, CDOCommitContext)</a></span> - Static method in class org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.html" title="class in org.eclipse.emf.cdo.transaction">CDOTransactionCommentator</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.html#appendSummary-java.lang.StringBuilder-org.eclipse.emf.cdo.transaction.CDOCommitContext-boolean-">appendSummary(StringBuilder, CDOCommitContext, boolean)</a></span> - Static method in class org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.html" title="class in org.eclipse.emf.cdo.transaction">CDOTransactionCommentator</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html#apply-org.eclipse.emf.cdo.common.revision.CDORevision-">apply(CDORevision)</a></span> - Method in interface org.eclipse.emf.cdo.common.revision.delta.<a href="org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</a></dt>
<dd>
<div class="block"><span class="deprecatedLabel">Deprecated.</span>
@@ -1290,6 +1294,8 @@
<div class="block">Encapsulation of an administrative operation requiring (potentially) client
authentication to authorize the operation.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html#AUTO_BRANCH_POINT">AUTO_BRANCH_POINT</a></span> - Static variable in class org.eclipse.emf.cdo.spi.common.branch.<a href="org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html" title="class in org.eclipse.emf.cdo.spi.common.branch">CDOBranchUtil</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Available.html#Available-org.eclipse.emf.cdo.common.id.CDOID-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchVersion-">Available(CDOID, CDOBranchPoint, CDOBranchVersion)</a></span> - Constructor for class org.eclipse.emf.cdo.spi.common.revision.<a href="org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Available.html" title="class in org.eclipse.emf.cdo.spi.common.revision">RevisionInfo.Available</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Available.html#Available-org.eclipse.emf.cdo.common.protocol.CDODataInput-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">Available(CDODataInput, CDOBranchPoint)</a></span> - Constructor for class org.eclipse.emf.cdo.spi.common.revision.<a href="org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Available.html" title="class in org.eclipse.emf.cdo.spi.common.revision">RevisionInfo.Available</a></dt>
@@ -2258,7 +2264,7 @@
</dd>
<dt><a href="org/eclipse/emf/cdo/common/lob/CDOBlob.html" title="class in org.eclipse.emf.cdo.common.lob"><span class="typeNameLink">CDOBlob</span></a> - Class in <a href="org/eclipse/emf/cdo/common/lob/package-summary.html">org.eclipse.emf.cdo.common.lob</a></dt>
<dd>
-<div class="block">A identifiable binary large object with streaming support.</div>
+<div class="block">An identifiable binary large object with streaming support.</div>
</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/lob/CDOBlob.html#CDOBlob-java.io.InputStream-">CDOBlob(InputStream)</a></span> - Constructor for class org.eclipse.emf.cdo.common.lob.<a href="org/eclipse/emf/cdo/common/lob/CDOBlob.html" title="class in org.eclipse.emf.cdo.common.lob">CDOBlob</a></dt>
<dd>&nbsp;</dd>
@@ -2306,9 +2312,13 @@
<dt><a href="org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="typeNameLink">CDOBranchPointRange</span></a> - Interface in <a href="org/eclipse/emf/cdo/common/branch/package-summary.html">org.eclipse.emf.cdo.common.branch</a></dt>
<dd>
<div class="block">A range between the <a href="org/eclipse/emf/cdo/common/branch/CDOBranch.html#getBase--"><code>base</code></a> of the <a href="org/eclipse/emf/cdo/common/branch/CDOBranchManager.html#getMainBranch--"><code>main branch</code></a> and
- the <a href="org/eclipse/emf/cdo/common/branch/CDOBranch.html#getHead--"><code>head</code></a> of any branch that is demarkated by a <a href="org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getStartPoint--"><code>start point</code></a> and
+ the <a href="org/eclipse/emf/cdo/common/branch/CDOBranch.html#getHead--"><code>head</code></a> of any branch that is demarcated by a <a href="org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getStartPoint--"><code>start point</code></a> and
an <a href="org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getEndPoint--"><code>end point</code></a>.</div>
</dd>
+<dt><a href="org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="typeNameLink">CDOBranchProvider</span></a> - Interface in <a href="org/eclipse/emf/cdo/common/branch/package-summary.html">org.eclipse.emf.cdo.common.branch</a></dt>
+<dd>
+<div class="block">Provides the consumer with a <a href="org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a>.</div>
+</dd>
<dt><a href="org/eclipse/emf/cdo/common/branch/CDOBranchTag.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="typeNameLink">CDOBranchTag</span></a> - Interface in <a href="org/eclipse/emf/cdo/common/branch/package-summary.html">org.eclipse.emf.cdo.common.branch</a></dt>
<dd>
<div class="block">A persistent, named <a href="org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch point</code></a>.</div>
@@ -2363,6 +2373,8 @@
</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html#CDOChangeSetSegment-org.eclipse.emf.cdo.common.branch.CDOBranch-long-long-">CDOChangeSetSegment(CDOBranch, long, long)</a></span> - Constructor for class org.eclipse.emf.cdo.spi.common.commit.<a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDOChangeSetSegment</a></dt>
<dd>&nbsp;</dd>
+<dt><a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.Handler.html" title="interface in org.eclipse.emf.cdo.spi.common.commit"><span class="typeNameLink">CDOChangeSetSegment.Handler</span></a> - Interface in <a href="org/eclipse/emf/cdo/spi/common/commit/package-summary.html">org.eclipse.emf.cdo.spi.common.commit</a></dt>
+<dd>&nbsp;</dd>
<dt><a href="org/eclipse/emf/spi/cdo/CDOChangeSubscriptionAdapter.html" title="class in org.eclipse.emf.spi.cdo"><span class="typeNameLink">CDOChangeSubscriptionAdapter</span></a> - Class in <a href="org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</a></dt>
<dd>
<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
@@ -2422,7 +2434,7 @@
</dd>
<dt><a href="org/eclipse/emf/cdo/common/lob/CDOClob.html" title="class in org.eclipse.emf.cdo.common.lob"><span class="typeNameLink">CDOClob</span></a> - Class in <a href="org/eclipse/emf/cdo/common/lob/package-summary.html">org.eclipse.emf.cdo.common.lob</a></dt>
<dd>
-<div class="block">A identifiable character large object with streaming support.</div>
+<div class="block">An identifiable character large object with streaming support.</div>
</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/lob/CDOClob.html#CDOClob-java.io.Reader-">CDOClob(Reader)</a></span> - Constructor for class org.eclipse.emf.cdo.common.lob.<a href="org/eclipse/emf/cdo/common/lob/CDOClob.html" title="class in org.eclipse.emf.cdo.common.lob">CDOClob</a></dt>
<dd>&nbsp;</dd>
@@ -2488,7 +2500,7 @@
</dd>
<dt><a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html" title="interface in org.eclipse.emf.cdo.common.commit"><span class="typeNameLink">CDOCommitInfoManager</span></a> - Interface in <a href="org/eclipse/emf/cdo/common/commit/package-summary.html">org.eclipse.emf.cdo.common.commit</a></dt>
<dd>
-<div class="block">Loads, provides and possible manages <a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit"><code>commit info</code></a> objects.</div>
+<div class="block">Provides access to <a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit"><code>commit info</code></a> objects.</div>
</dd>
<dt><a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfoProvider.html" title="interface in org.eclipse.emf.cdo.common.commit"><span class="typeNameLink">CDOCommitInfoProvider</span></a> - Interface in <a href="org/eclipse/emf/cdo/common/commit/package-summary.html">org.eclipse.emf.cdo.common.commit</a></dt>
<dd>
@@ -2508,6 +2520,11 @@
<dd>
<div class="block">Abstracts the information about CDO repositories that is common to both client and server side.</div>
</dd>
+<dt><a href="org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common"><span class="typeNameLink">CDOCommonRepository.CommitInfoStorage</span></a> - Enum in <a href="org/eclipse/emf/cdo/common/package-summary.html">org.eclipse.emf.cdo.common</a></dt>
+<dd>
+<div class="block">Enumerates the possible <a href="org/eclipse/emf/cdo/common/CDOCommonRepository.html#getIDGenerationLocation--"><code>ID generation locations</code></a> of a CDO
+ repository.</div>
+</dd>
<dt><a href="org/eclipse/emf/cdo/common/CDOCommonRepository.IDGenerationLocation.html" title="enum in org.eclipse.emf.cdo.common"><span class="typeNameLink">CDOCommonRepository.IDGenerationLocation</span></a> - Enum in <a href="org/eclipse/emf/cdo/common/package-summary.html">org.eclipse.emf.cdo.common</a></dt>
<dd>
<div class="block">Enumerates the possible <a href="org/eclipse/emf/cdo/common/CDOCommonRepository.html#getIDGenerationLocation--"><code>ID generation locations</code></a> of a CDO
@@ -3213,7 +3230,7 @@
<dd>&nbsp;</dd>
<dt><a href="org/eclipse/emf/cdo/util/CDOLazyContentAdapter.html" title="class in org.eclipse.emf.cdo.util"><span class="typeNameLink">CDOLazyContentAdapter</span></a> - Class in <a href="org/eclipse/emf/cdo/util/package-summary.html">org.eclipse.emf.cdo.util</a></dt>
<dd>
-<div class="block">A scalable <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/util/EContentAdapter.html?is-external=true" title="class or interface in org.eclipse.emf.ecore.util"><code>content adapter</code></a> that uses CDO mechansims to attach itself to <a href="org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><code>objects</code></a> when they are lazily loaded.</div>
+<div class="block">A scalable <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/util/EContentAdapter.html?is-external=true" title="class or interface in org.eclipse.emf.ecore.util"><code>content adapter</code></a> that uses CDO mechanisms to attach itself to <a href="org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><code>objects</code></a> when they are lazily loaded.</div>
</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/util/CDOLazyContentAdapter.html#CDOLazyContentAdapter--">CDOLazyContentAdapter()</a></span> - Constructor for class org.eclipse.emf.cdo.util.<a href="org/eclipse/emf/cdo/util/CDOLazyContentAdapter.html" title="class in org.eclipse.emf.cdo.util">CDOLazyContentAdapter</a></dt>
<dd>&nbsp;</dd>
@@ -3562,7 +3579,7 @@
</dd>
<dt><a href="org/eclipse/emf/cdo/common/util/CDOQueryInfo.html" title="interface in org.eclipse.emf.cdo.common.util"><span class="typeNameLink">CDOQueryInfo</span></a> - Interface in <a href="org/eclipse/emf/cdo/common/util/package-summary.html">org.eclipse.emf.cdo.common.util</a></dt>
<dd>
-<div class="block">Encapsulates all the transferrable information that fully specifies a query from a <a href="org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common"><code>view</code></a> to a
+<div class="block">Encapsulates all the transferable information that fully specifies a query from a <a href="org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common"><code>view</code></a> to a
<a href="org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><code>repository</code></a>.</div>
</dd>
<dt><a href="org/eclipse/emf/cdo/common/util/CDOQueryQueue.html" title="class in org.eclipse.emf.cdo.common.util"><span class="typeNameLink">CDOQueryQueue</span></a>&lt;<a href="org/eclipse/emf/cdo/common/util/CDOQueryQueue.html" title="type parameter in CDOQueryQueue">E</a>&gt; - Class in <a href="org/eclipse/emf/cdo/common/util/package-summary.html">org.eclipse.emf.cdo.common.util</a></dt>
@@ -3812,6 +3829,16 @@
<dd>
<div class="block">This constructs an instance from a factory and a notifier.</div>
</dd>
+<dt><a href="org/eclipse/emf/cdo/common/util/CDOResourceNodeNotFoundException.html" title="class in org.eclipse.emf.cdo.common.util"><span class="typeNameLink">CDOResourceNodeNotFoundException</span></a> - Exception in <a href="org/eclipse/emf/cdo/common/util/package-summary.html">org.eclipse.emf.cdo.common.util</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/util/CDOResourceNodeNotFoundException.html#CDOResourceNodeNotFoundException--">CDOResourceNodeNotFoundException()</a></span> - Constructor for exception org.eclipse.emf.cdo.common.util.<a href="org/eclipse/emf/cdo/common/util/CDOResourceNodeNotFoundException.html" title="class in org.eclipse.emf.cdo.common.util">CDOResourceNodeNotFoundException</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/util/CDOResourceNodeNotFoundException.html#CDOResourceNodeNotFoundException-java.lang.String-java.lang.Throwable-">CDOResourceNodeNotFoundException(String, Throwable)</a></span> - Constructor for exception org.eclipse.emf.cdo.common.util.<a href="org/eclipse/emf/cdo/common/util/CDOResourceNodeNotFoundException.html" title="class in org.eclipse.emf.cdo.common.util">CDOResourceNodeNotFoundException</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/util/CDOResourceNodeNotFoundException.html#CDOResourceNodeNotFoundException-java.lang.String-">CDOResourceNodeNotFoundException(String)</a></span> - Constructor for exception org.eclipse.emf.cdo.common.util.<a href="org/eclipse/emf/cdo/common/util/CDOResourceNodeNotFoundException.html" title="class in org.eclipse.emf.cdo.common.util">CDOResourceNodeNotFoundException</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/util/CDOResourceNodeNotFoundException.html#CDOResourceNodeNotFoundException-java.lang.Throwable-">CDOResourceNodeNotFoundException(Throwable)</a></span> - Constructor for exception org.eclipse.emf.cdo.common.util.<a href="org/eclipse/emf/cdo/common/util/CDOResourceNodeNotFoundException.html" title="class in org.eclipse.emf.cdo.common.util">CDOResourceNodeNotFoundException</a></dt>
+<dd>&nbsp;</dd>
<dt><a href="org/eclipse/emf/cdo/session/CDORetryExceptionHandler.html" title="class in org.eclipse.emf.cdo.session"><span class="typeNameLink">CDORetryExceptionHandler</span></a> - Class in <a href="org/eclipse/emf/cdo/session/package-summary.html">org.eclipse.emf.cdo.session</a></dt>
<dd>
<div class="block">A <a href="org/eclipse/emf/cdo/session/CDOSession.ExceptionHandler.html" title="interface in org.eclipse.emf.cdo.session"><code>session exection handler</code></a> that retries the failed protocol operation a configurable number
@@ -3853,6 +3880,8 @@
<dd>
<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html#CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.revision.CDORevisionManager-">CDORevisionAvailabilityInfo(CDOBranchPoint, CDORevisionManager)</a></span> - Constructor for class org.eclipse.emf.cdo.spi.common.commit.<a href="org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html#CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">CDORevisionAvailabilityInfo(CDOBranchPoint)</a></span> - Constructor for class org.eclipse.emf.cdo.spi.common.commit.<a href="org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</a></dt>
<dd>&nbsp;</dd>
<dt><a href="org/eclipse/emf/cdo/common/revision/CDORevisionCache.html" title="interface in org.eclipse.emf.cdo.common.revision"><span class="typeNameLink">CDORevisionCache</span></a> - Interface in <a href="org/eclipse/emf/cdo/common/revision/package-summary.html">org.eclipse.emf.cdo.common.revision</a></dt>
@@ -4046,6 +4075,10 @@
<dd>
<div class="block">Persists the data that has been read by a <a href="org/eclipse/emf/cdo/server/CDOServerImporter.html" title="class in org.eclipse.emf.cdo.server"><code>importer</code></a> into a new <a href="org/eclipse/emf/cdo/server/IRepository.html" title="interface in org.eclipse.emf.cdo.server"><code>repository</code></a>.</div>
</dd>
+<dt><a href="org/eclipse/emf/cdo/server/CDOServerImporter.Handler2.html" title="interface in org.eclipse.emf.cdo.server"><span class="typeNameLink">CDOServerImporter.Handler2</span></a> - Interface in <a href="org/eclipse/emf/cdo/server/package-summary.html">org.eclipse.emf.cdo.server</a></dt>
+<dd>
+<div class="block">Persists the data that has been read by a <a href="org/eclipse/emf/cdo/server/CDOServerImporter.html" title="class in org.eclipse.emf.cdo.server"><code>importer</code></a> into a new <a href="org/eclipse/emf/cdo/server/IRepository.html" title="interface in org.eclipse.emf.cdo.server"><code>repository</code></a>.</div>
+</dd>
<dt><a href="org/eclipse/emf/cdo/server/CDOServerImporter.XML.html" title="class in org.eclipse.emf.cdo.server"><span class="typeNameLink">CDOServerImporter.XML</span></a> - Class in <a href="org/eclipse/emf/cdo/server/package-summary.html">org.eclipse.emf.cdo.server</a></dt>
<dd>
<div class="block">An <a href="org/eclipse/emf/cdo/server/CDOServerImporter.html" title="class in org.eclipse.emf.cdo.server"><code>importer</code></a> that reads and interprets XML output created by an
@@ -4190,6 +4223,8 @@
<dd>
<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
</dd>
+<dt><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.MergeDataResult.html" title="class in org.eclipse.emf.spi.cdo"><span class="typeNameLink">CDOSessionProtocol.MergeDataResult</span></a> - Class in <a href="org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</a></dt>
+<dd>&nbsp;</dd>
<dt><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.OpenSessionResult.html" title="class in org.eclipse.emf.spi.cdo"><span class="typeNameLink">CDOSessionProtocol.OpenSessionResult</span></a> - Class in <a href="org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</a></dt>
<dd>
<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
@@ -4338,6 +4373,8 @@
</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.html#CDOTransactionCommentator-org.eclipse.emf.cdo.transaction.CDOTransaction-">CDOTransactionCommentator(CDOTransaction)</a></span> - Constructor for class org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.html" title="class in org.eclipse.emf.cdo.transaction">CDOTransactionCommentator</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.html#CDOTransactionCommentator-org.eclipse.emf.cdo.transaction.CDOTransaction-boolean-">CDOTransactionCommentator(CDOTransaction, boolean)</a></span> - Constructor for class org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.html" title="class in org.eclipse.emf.cdo.transaction">CDOTransactionCommentator</a></dt>
+<dd>&nbsp;</dd>
<dt><a href="org/eclipse/emf/cdo/transaction/CDOTransactionConflictEvent.html" title="interface in org.eclipse.emf.cdo.transaction"><span class="typeNameLink">CDOTransactionConflictEvent</span></a> - Interface in <a href="org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</a></dt>
<dd>
<div class="block">A <a href="org/eclipse/emf/cdo/view/CDOViewEvent.html" title="interface in org.eclipse.emf.cdo.view"><code>view event</code></a> fired from a <a href="org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transaction</code></a> for each
@@ -4372,6 +4409,8 @@
<div class="block">A call-back interface that is called by a <a href="org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transaction</code></a> before <a href="org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><code>objects</code></a> are
attached, modified or detached.</div>
</dd>
+<dt><a href="org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.WithUndo.html" title="interface in org.eclipse.emf.cdo.transaction"><span class="typeNameLink">CDOTransactionHandler1.WithUndo</span></a> - Interface in <a href="org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</a></dt>
+<dd>&nbsp;</dd>
<dt><a href="org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction"><span class="typeNameLink">CDOTransactionHandler2</span></a> - Interface in <a href="org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</a></dt>
<dd>
<div class="block">A call-back interface that is called by a <a href="org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transcation</code></a> before it is committed and after it has
@@ -4540,6 +4579,10 @@
<dd>
<div class="block">Various static methods that may help in CDO client applications.</div>
</dd>
+<dt><a href="org/eclipse/emf/cdo/common/util/CDOVersionProvider.html" title="interface in org.eclipse.emf.cdo.common.util"><span class="typeNameLink">CDOVersionProvider</span></a> - Interface in <a href="org/eclipse/emf/cdo/common/util/package-summary.html">org.eclipse.emf.cdo.common.util</a></dt>
+<dd>
+<div class="block">Provides the consumer with an int-valued version.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/CDOObject.html#cdoView--">cdoView()</a></span> - Method in interface org.eclipse.emf.cdo.<a href="org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a></dt>
<dd>
<div class="block">Returns the <a href="org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><code>view</code></a> this object is associated with, or <code>null</code> if this object is not
@@ -5562,6 +5605,10 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/CDOServerExporter.XMLConstants.html#COMMIT_COMMENT">COMMIT_COMMENT</a></span> - Static variable in interface org.eclipse.emf.cdo.server.<a href="org/eclipse/emf/cdo/server/CDOServerExporter.XMLConstants.html" title="interface in org.eclipse.emf.cdo.server">CDOServerExporter.XMLConstants</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/IRepository.Props.html#COMMIT_INFO_STORAGE">COMMIT_INFO_STORAGE</a></span> - Static variable in interface org.eclipse.emf.cdo.server.<a href="org/eclipse/emf/cdo/server/IRepository.Props.html" title="interface in org.eclipse.emf.cdo.server">IRepository.Props</a></dt>
+<dd>
+<div class="block">Possible values: NO | YES | WITH_MERGE_SOURCE.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/CDOServerExporter.XMLConstants.html#COMMIT_PREVIOUS">COMMIT_PREVIOUS</a></span> - Static variable in interface org.eclipse.emf.cdo.server.<a href="org/eclipse/emf/cdo/server/CDOServerExporter.XMLConstants.html" title="interface in org.eclipse.emf.cdo.server">CDOServerExporter.XMLConstants</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/CDOServerExporter.XMLConstants.html#COMMIT_TIME">COMMIT_TIME</a></span> - Static variable in interface org.eclipse.emf.cdo.server.<a href="org/eclipse/emf/cdo/server/CDOServerExporter.XMLConstants.html" title="interface in org.eclipse.emf.cdo.server">CDOServerExporter.XMLConstants</a></dt>
@@ -5965,6 +6012,10 @@
<dd>
<div class="block">Optimization taken from ResourceImpl.EContentList.contains.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html#contains-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">contains(CDOBranchPoint)</a></span> - Method in class org.eclipse.emf.cdo.spi.common.commit.<a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDOChangeSetSegment</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html#contains-org.eclipse.emf.cdo.spi.common.commit.CDOChangeSetSegment:A-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">contains(CDOChangeSetSegment[], CDOBranchPoint)</a></span> - Static method in class org.eclipse.emf.cdo.spi.common.commit.<a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDOChangeSetSegment</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.html#contains-org.eclipse.emf.ecore.EStructuralFeature-java.lang.Object-">contains(EStructuralFeature, Object)</a></span> - Method in class org.eclipse.emf.cdo.spi.common.revision.<a href="org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">BaseCDORevision</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevision.html#contains-org.eclipse.emf.ecore.EStructuralFeature-java.lang.Object-">contains(EStructuralFeature, Object)</a></span> - Method in class org.eclipse.emf.cdo.spi.common.revision.<a href="org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">DelegatingCDORevision</a></dt>
@@ -6063,6 +6114,10 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/security/impl/SecurityFactoryImpl.html#convertAccessToString-org.eclipse.emf.ecore.EDataType-java.lang.Object-">convertAccessToString(EDataType, Object)</a></span> - Method in class org.eclipse.emf.cdo.security.impl.<a href="org/eclipse/emf/cdo/security/impl/SecurityFactoryImpl.html" title="class in org.eclipse.emf.cdo.security.impl">SecurityFactoryImpl</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.html#convertBlobToString-org.eclipse.emf.ecore.EDataType-java.lang.Object-">convertBlobToString(EDataType, Object)</a></span> - Method in class org.eclipse.emf.cdo.etypes.impl.<a href="org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.html" title="class in org.eclipse.emf.cdo.etypes.impl">EtypesFactoryImpl</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.html#convertClobToString-org.eclipse.emf.ecore.EDataType-java.lang.Object-">convertClobToString(EDataType, Object)</a></span> - Method in class org.eclipse.emf.cdo.etypes.impl.<a href="org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.html" title="class in org.eclipse.emf.cdo.etypes.impl">EtypesFactoryImpl</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.html#convertEObjects-org.eclipse.emf.cdo.common.id.CDOIDProvider-">convertEObjects(CDOIDProvider)</a></span> - Method in class org.eclipse.emf.cdo.spi.common.revision.<a href="org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">BaseCDORevision</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevision.html#convertEObjects-org.eclipse.emf.cdo.common.id.CDOIDProvider-">convertEObjects(CDOIDProvider)</a></span> - Method in class org.eclipse.emf.cdo.spi.common.revision.<a href="org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">DelegatingCDORevision</a></dt>
@@ -6145,6 +6200,12 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/model/CDOModelConstants.html#CORE_PACKAGE_URI">CORE_PACKAGE_URI</a></span> - Static variable in interface org.eclipse.emf.cdo.common.model.<a href="org/eclipse/emf/cdo/common/model/CDOModelConstants.html" title="interface in org.eclipse.emf.cdo.common.model">CDOModelConstants</a></dt>
<dd>&nbsp;</dd>
+<dt><a href="org/eclipse/emf/cdo/common/util/CountedTimeProvider.html" title="class in org.eclipse.emf.cdo.common.util"><span class="typeNameLink">CountedTimeProvider</span></a> - Class in <a href="org/eclipse/emf/cdo/common/util/package-summary.html">org.eclipse.emf.cdo.common.util</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/util/CountedTimeProvider.html#CountedTimeProvider--">CountedTimeProvider()</a></span> - Constructor for class org.eclipse.emf.cdo.common.util.<a href="org/eclipse/emf/cdo/common/util/CountedTimeProvider.html" title="class in org.eclipse.emf.cdo.common.util">CountedTimeProvider</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/util/CountedTimeProvider.html#CountedTimeProvider-long-">CountedTimeProvider(long)</a></span> - Constructor for class org.eclipse.emf.cdo.common.util.<a href="org/eclipse/emf/cdo/common/util/CountedTimeProvider.html" title="class in org.eclipse.emf.cdo.common.util">CountedTimeProvider</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/compare/CDOComparisonScope.AllContents.html#create-org.eclipse.emf.cdo.CDOObject-org.eclipse.emf.cdo.view.CDOView-org.eclipse.emf.cdo.view.CDOView:A-">create(CDOObject, CDOView, CDOView[])</a></span> - Static method in class org.eclipse.emf.cdo.compare.<a href="org/eclipse/emf/cdo/compare/CDOComparisonScope.AllContents.html" title="class in org.eclipse.emf.cdo.compare">CDOComparisonScope.AllContents</a></dt>
<dd>
<div class="block">Takes an arbitrary <a href="org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><code>object</code></a> (including <a href="org/eclipse/emf/cdo/eresource/CDOResourceNode.html" title="interface in org.eclipse.emf.cdo.eresource"><code>resource nodes</code></a>) and returns <code>matches</code> for <b>all</b> elements of its <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EObject.html?is-external=true#eAllContents--" title="class or interface in org.eclipse.emf.ecore"><code>content tree</code></a>.</div>
@@ -6302,6 +6363,8 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/lob/CDOLobUtil.html#createBlob-byte:A-long-">createBlob(byte[], long)</a></span> - Static method in class org.eclipse.emf.cdo.common.lob.<a href="org/eclipse/emf/cdo/common/lob/CDOLobUtil.html" title="class in org.eclipse.emf.cdo.common.lob">CDOLobUtil</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.html#createBlobFromString-org.eclipse.emf.ecore.EDataType-java.lang.String-">createBlobFromString(EDataType, String)</a></span> - Method in class org.eclipse.emf.cdo.etypes.impl.<a href="org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.html" title="class in org.eclipse.emf.cdo.etypes.impl">EtypesFactoryImpl</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/lob/CDOLobUtil.html#createBlobOutputStream--">createBlobOutputStream()</a></span> - Static method in class org.eclipse.emf.cdo.common.lob.<a href="org/eclipse/emf/cdo/common/lob/CDOLobUtil.html" title="class in org.eclipse.emf.cdo.common.lob">CDOLobUtil</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/expressions/ExpressionsFactory.html#createBooleanValue--">createBooleanValue()</a></span> - Method in interface org.eclipse.emf.cdo.expressions.<a href="org/eclipse/emf/cdo/expressions/ExpressionsFactory.html" title="interface in org.eclipse.emf.cdo.expressions">ExpressionsFactory</a></dt>
@@ -6336,6 +6399,8 @@
</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.html#createBranch-int-java.lang.String-org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranch-long-">createBranch(int, String, InternalCDOBranch, long)</a></span> - Method in interface org.eclipse.emf.cdo.spi.common.branch.<a href="org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.html" title="interface in org.eclipse.emf.cdo.spi.common.branch">InternalCDOBranchManager</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/util/CDOUtil.html#createBranch-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-java.lang.String-">createBranch(CDOBranchPoint, String)</a></span> - Static method in class org.eclipse.emf.cdo.util.<a href="org/eclipse/emf/cdo/util/CDOUtil.html" title="class in org.eclipse.emf.cdo.util">CDOUtil</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/ui/widgets/ComposeBranchPointComposite.html#createBranchItemProvider--">createBranchItemProvider()</a></span> - Method in class org.eclipse.emf.cdo.ui.widgets.<a href="org/eclipse/emf/cdo/ui/widgets/ComposeBranchPointComposite.html" title="class in org.eclipse.emf.cdo.ui.widgets">ComposeBranchPointComposite</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html#createBranchManager--">createBranchManager()</a></span> - Static method in class org.eclipse.emf.cdo.spi.common.branch.<a href="org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html" title="class in org.eclipse.emf.cdo.spi.common.branch">CDOBranchUtil</a></dt>
@@ -6547,6 +6612,8 @@
</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/lob/CDOLobUtil.html#createClob-byte:A-long-">createClob(byte[], long)</a></span> - Static method in class org.eclipse.emf.cdo.common.lob.<a href="org/eclipse/emf/cdo/common/lob/CDOLobUtil.html" title="class in org.eclipse.emf.cdo.common.lob">CDOLobUtil</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.html#createClobFromString-org.eclipse.emf.ecore.EDataType-java.lang.String-">createClobFromString(EDataType, String)</a></span> - Method in class org.eclipse.emf.cdo.etypes.impl.<a href="org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.html" title="class in org.eclipse.emf.cdo.etypes.impl">EtypesFactoryImpl</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/lob/CDOLobUtil.html#createClobWriter--">createClobWriter()</a></span> - Static method in class org.eclipse.emf.cdo.common.lob.<a href="org/eclipse/emf/cdo/common/lob/CDOLobUtil.html" title="class in org.eclipse.emf.cdo.common.lob">CDOLobUtil</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/util/CDOUtil.html#createCollectionLoadingPolicy-int-int-">createCollectionLoadingPolicy(int, int)</a></span> - Static method in class org.eclipse.emf.cdo.util.<a href="org/eclipse/emf/cdo/util/CDOUtil.html" title="class in org.eclipse.emf.cdo.util">CDOUtil</a></dt>
@@ -6569,6 +6636,8 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/commit/InternalCDOCommitInfoManager.html#createCommitInfo-org.eclipse.emf.cdo.common.branch.CDOBranch-long-long-java.lang.String-java.lang.String-org.eclipse.emf.cdo.common.commit.CDOCommitData-">createCommitInfo(CDOBranch, long, long, String, String, CDOCommitData)</a></span> - Method in interface org.eclipse.emf.cdo.spi.common.commit.<a href="org/eclipse/emf/cdo/spi/common/commit/InternalCDOCommitInfoManager.html" title="interface in org.eclipse.emf.cdo.spi.common.commit">InternalCDOCommitInfoManager</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/commit/InternalCDOCommitInfoManager.html#createCommitInfo-org.eclipse.emf.cdo.common.branch.CDOBranch-long-long-java.lang.String-java.lang.String-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.commit.CDOCommitData-">createCommitInfo(CDOBranch, long, long, String, String, CDOBranchPoint, CDOCommitData)</a></span> - Method in interface org.eclipse.emf.cdo.spi.common.commit.<a href="org/eclipse/emf/cdo/spi/common/commit/InternalCDOCommitInfoManager.html" title="interface in org.eclipse.emf.cdo.spi.common.commit">InternalCDOCommitInfoManager</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/commit/CDOCommitInfoUtil.html#createCommitInfoManager-boolean-">createCommitInfoManager(boolean)</a></span> - Static method in class org.eclipse.emf.cdo.spi.common.commit.<a href="org/eclipse/emf/cdo/spi/common/commit/CDOCommitInfoUtil.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDOCommitInfoUtil</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/commit/CDOCommitInfoUtil.html#createCommitInfoManager--">createCommitInfoManager()</a></span> - Static method in class org.eclipse.emf.cdo.spi.common.commit.<a href="org/eclipse/emf/cdo/spi/common/commit/CDOCommitInfoUtil.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDOCommitInfoUtil</a></dt>
@@ -6847,6 +6916,8 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/workspace/CDOWorkspaceUtil.html#createFolderWorkspaceBase-java.io.File-">createFolderWorkspaceBase(File)</a></span> - Static method in class org.eclipse.emf.cdo.workspace.<a href="org/eclipse/emf/cdo/workspace/CDOWorkspaceUtil.html" title="class in org.eclipse.emf.cdo.workspace">CDOWorkspaceUtil</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html#createFrom-long-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">createFrom(long, CDOBranchPoint)</a></span> - Static method in class org.eclipse.emf.cdo.spi.common.commit.<a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDOChangeSetSegment</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html#createFrom-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">createFrom(CDOBranchPoint, CDOBranchPoint)</a></span> - Static method in class org.eclipse.emf.cdo.spi.common.commit.<a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDOChangeSetSegment</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.html#createFromString-org.eclipse.emf.ecore.EDataType-java.lang.String-">createFromString(EDataType, String)</a></span> - Method in class org.eclipse.emf.cdo.eresource.impl.<a href="org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.html" title="class in org.eclipse.emf.cdo.eresource.impl">EresourceFactoryImpl</a></dt>
@@ -7724,6 +7795,8 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/model/EMFUtil.html#CROSS_REFERENCES">CROSS_REFERENCES</a></span> - Static variable in class org.eclipse.emf.cdo.common.model.<a href="org/eclipse/emf/cdo/common/model/EMFUtil.html" title="class in org.eclipse.emf.cdo.common.model">EMFUtil</a></dt>
<dd>&nbsp;</dd>
+<dt><a href="org/eclipse/emf/cdo/common/util/CurrentTimeProvider.html" title="class in org.eclipse.emf.cdo.common.util"><span class="typeNameLink">CurrentTimeProvider</span></a> - Class in <a href="org/eclipse/emf/cdo/common/util/package-summary.html">org.eclipse.emf.cdo.common.util</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/model/CDOType.html#CUSTOM">CUSTOM</a></span> - Static variable in interface org.eclipse.emf.cdo.common.model.<a href="org/eclipse/emf/cdo/common/model/CDOType.html" title="interface in org.eclipse.emf.cdo.common.model">CDOType</a></dt>
<dd>&nbsp;</dd>
</dl>
@@ -10253,11 +10326,19 @@
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html#getAncestor-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">getAncestor(CDOBranchPoint, CDOBranchPoint)</a></span> - Static method in class org.eclipse.emf.cdo.spi.common.branch.<a href="org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html" title="class in org.eclipse.emf.cdo.spi.common.branch">CDOBranchUtil</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getAncestor--">getAncestor()</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">As of 4.6 use <a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getTargetBase--"><code>InternalCDOSession.MergeData.getTargetBase()</code></a>.</span></div>
+</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Element.html#getAncestorIndex--">getAncestorIndex()</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Element.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.Element</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getAncestorInfo--">getAncestorInfo()</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">As of 4.6 use <a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getTargetBaseInfo--"><code>InternalCDOSession.MergeData.getTargetBaseInfo()</code></a>.</span></div>
+</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/commit/CDOChangeSet.html#getAncestorPoint--">getAncestorPoint()</a></span> - Method in interface org.eclipse.emf.cdo.common.commit.<a href="org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/security/impl/SecurityPackageImpl.html#getAndFilter--">getAndFilter()</a></span> - Method in class org.eclipse.emf.cdo.security.impl.<a href="org/eclipse/emf/cdo/security/impl/SecurityPackageImpl.html" title="class in org.eclipse.emf.cdo.security.impl">SecurityPackageImpl</a></dt>
@@ -10447,7 +10528,11 @@
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.BranchLoader.BranchInfo.html#getBaseBranchID--">getBaseBranchID()</a></span> - Method in class org.eclipse.emf.cdo.spi.common.branch.<a href="org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.BranchLoader.BranchInfo.html" title="class in org.eclipse.emf.cdo.spi.common.branch">InternalCDOBranchManager.BranchLoader.BranchInfo</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getBaseInfo--">getBaseInfo()</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">As of 4.6 use <a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getSourceBaseInfo--"><code>InternalCDOSession.MergeData.getSourceBaseInfo()</code></a>.</span></div>
+</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getBaseNewObjects--">getBaseNewObjects()</a></span> - Method in interface org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOSavepoint.html" title="interface in org.eclipse.emf.cdo.transaction">CDOSavepoint</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getBaseOfBranch-org.eclipse.emf.cdo.common.branch.CDOBranch-">getBaseOfBranch(CDOBranch)</a></span> - Method in interface org.eclipse.emf.cdo.common.commit.<a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfoManager</a></dt>
@@ -10527,6 +10612,8 @@
<div class="block">Returns the branch of this branch point, or <code>null</code> if this branch point is the
<a href="org/eclipse/emf/cdo/common/branch/CDOBranch.html#getBase--"><code>base</code></a> of the <a href="org/eclipse/emf/cdo/common/branch/CDOBranchManager.html#getMainBranch--"><code>main branch</code></a>.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html#getBranch--">getBranch()</a></span> - Method in interface org.eclipse.emf.cdo.common.branch.<a href="org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html#getBranch--">getBranch()</a></span> - Method in interface org.eclipse.emf.cdo.common.branch.<a href="org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchVersion</a></dt>
<dd>
<div class="block">Returns the branch of this branch version.</div>
@@ -10659,6 +10746,8 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/explorer/checkouts/CDOCheckout.html#getBranchPoints--">getBranchPoints()</a></span> - Method in interface org.eclipse.emf.cdo.explorer.checkouts.<a href="org/eclipse/emf/cdo/explorer/checkouts/CDOCheckout.html" title="interface in org.eclipse.emf.cdo.explorer.checkouts">CDOCheckout</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.LabelProvider.html#getBranchString-org.eclipse.emf.cdo.common.branch.CDOBranch-">getBranchString(CDOBranch)</a></span> - Method in class org.eclipse.emf.cdo.ui.widgets.<a href="org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.LabelProvider.html" title="class in org.eclipse.emf.cdo.ui.widgets">CommitHistoryComposite.LabelProvider</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/ui/widgets/SelectBranchComposite.html#getBranchText--">getBranchText()</a></span> - Method in class org.eclipse.emf.cdo.ui.widgets.<a href="org/eclipse/emf/cdo/ui/widgets/SelectBranchComposite.html" title="class in org.eclipse.emf.cdo.ui.widgets">SelectBranchComposite</a></dt>
<dd>
<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
@@ -11270,6 +11359,8 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getCommitInfo-long-">getCommitInfo(long)</a></span> - Method in interface org.eclipse.emf.cdo.common.commit.<a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfoManager</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getCommitInfo-long-boolean-">getCommitInfo(long, boolean)</a></span> - Method in interface org.eclipse.emf.cdo.common.commit.<a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfoManager</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getCommitInfo-org.eclipse.emf.cdo.common.branch.CDOBranch-long-boolean-">getCommitInfo(CDOBranch, long, boolean)</a></span> - Method in interface org.eclipse.emf.cdo.common.commit.<a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfoManager</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/protocol/CDOProtocol.CommitNotificationInfo.html#getCommitInfo--">getCommitInfo()</a></span> - Method in class org.eclipse.emf.cdo.common.protocol.<a href="org/eclipse/emf/cdo/common/protocol/CDOProtocol.CommitNotificationInfo.html" title="class in org.eclipse.emf.cdo.common.protocol">CDOProtocol.CommitNotificationInfo</a></dt>
@@ -11306,12 +11397,22 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getCommitInfos-org.eclipse.emf.cdo.common.branch.CDOBranch-long-java.lang.String-java.lang.String-int-org.eclipse.emf.cdo.common.commit.CDOCommitInfoHandler-">getCommitInfos(CDOBranch, long, String, String, int, CDOCommitInfoHandler)</a></span> - Method in interface org.eclipse.emf.cdo.common.commit.<a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfoManager</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/CDOCommonRepository.html#getCommitInfoStorage--">getCommitInfoStorage()</a></span> - Method in interface org.eclipse.emf.cdo.common.<a href="org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonRepository</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.OpenSessionResult.html#getCommitInfoStorage--">getCommitInfoStorage()</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.OpenSessionResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.OpenSessionResult</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOTransaction.Options.html#getCommitInfoTimeout--">getCommitInfoTimeout()</a></span> - Method in interface org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOTransaction.Options.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction.Options</a></dt>
<dd>
<div class="block">Returns the number of milliseconds to wait for the transaction update when <a href="org/eclipse/emf/cdo/transaction/CDOUserTransaction.html#commit--"><code>CDOUserTransaction.commit()</code></a> is called.</div>
</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/server/InternalRepository.html#getCommitManager--">getCommitManager()</a></span> - Method in interface org.eclipse.emf.cdo.spi.server.<a href="org/eclipse/emf/cdo/spi/server/InternalRepository.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalRepository</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/IStoreAccessor.CommitContext.html#getCommitMergeSource--">getCommitMergeSource()</a></span> - Method in interface org.eclipse.emf.cdo.server.<a href="org/eclipse/emf/cdo/server/IStoreAccessor.CommitContext.html" title="interface in org.eclipse.emf.cdo.server">IStoreAccessor.CommitContext</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOCommitContext.html#getCommitMergeSource--">getCommitMergeSource()</a></span> - Method in interface org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOCommitContext.html" title="interface in org.eclipse.emf.cdo.transaction">CDOCommitContext</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOTransaction.html#getCommitMergeSource--">getCommitMergeSource()</a></span> - Method in interface org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOTransaction.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOTransaction</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/server/InternalTransaction.CommitAttempt.html#getCommitNumber--">getCommitNumber()</a></span> - Method in class org.eclipse.emf.cdo.spi.server.<a href="org/eclipse/emf/cdo/spi/server/InternalTransaction.CommitAttempt.html" title="class in org.eclipse.emf.cdo.spi.server">InternalTransaction.CommitAttempt</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.CommitToken.html#getCommitNumber--">getCommitNumber()</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOSession.CommitToken.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.CommitToken</a></dt>
@@ -11343,7 +11444,9 @@
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#getConflicts--">getConflicts()</a></span> - Method in class org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOTransaction.html#getConflicts--">getConflicts()</a></span> - Method in interface org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Returns the set of objects that are conflicting with remote modifications or an empty set if <a href="org/eclipse/emf/cdo/transaction/CDOTransaction.html#hasConflict--"><code>CDOTransaction.hasConflict()</code></a> returns <code>false</code>.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#getConflicts--">getConflicts()</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/DefaultCDOMerger.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/admin/CDOAdminClientManager.html#getConnection-java.lang.String-">getConnection(String)</a></span> - Method in interface org.eclipse.emf.cdo.admin.<a href="org/eclipse/emf/cdo/admin/CDOAdminClientManager.html" title="interface in org.eclipse.emf.cdo.admin">CDOAdminClientManager</a></dt>
@@ -11686,6 +11789,8 @@
<dd>
<div class="block">Return the descriptor of the kind of type mapping created by this factory.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOSavepoint.html#getDetachedObject-org.eclipse.emf.cdo.common.id.CDOID-">getDetachedObject(CDOID)</a></span> - Method in interface org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOSavepoint.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOSavepoint</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html#getDetachedObjects--">getDetachedObjects()</a></span> - Method in interface org.eclipse.emf.cdo.common.commit.<a href="org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a></dt>
<dd>
<div class="block">Returns a collection of keys denoting which revisions have been revised (corresponds to detached objects) in the
@@ -11758,6 +11863,8 @@
<dd>
<div class="block">Returns the meta object for the attribute '<a href="org/eclipse/emf/cdo/security/Directory.html#getName--"><code><em>Name</em></code></a>'.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOSavepoint.html#getDirtyObject-org.eclipse.emf.cdo.common.id.CDOID-">getDirtyObject(CDOID)</a></span> - Method in interface org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOSavepoint.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOSavepoint</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/security/impl/PermissionImpl.CommitImpactContext.html#getDirtyObjectDeltas--">getDirtyObjectDeltas()</a></span> - Method in interface org.eclipse.emf.cdo.security.impl.<a href="org/eclipse/emf/cdo/security/impl/PermissionImpl.CommitImpactContext.html" title="interface in org.eclipse.emf.cdo.security.impl">PermissionImpl.CommitImpactContext</a></dt>
<dd>
<div class="block">Returns the revision deltas of the changed objects of the current commit.</div>
@@ -12845,8 +12952,12 @@
</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/server/Store.html#getLastBranchID--">getLastBranchID()</a></span> - Method in class org.eclipse.emf.cdo.spi.server.<a href="org/eclipse/emf/cdo/spi/server/Store.html" title="class in org.eclipse.emf.cdo.spi.server">Store</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getLastCommit--">getLastCommit()</a></span> - Method in interface org.eclipse.emf.cdo.common.commit.<a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfoManager</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/server/InternalTransaction.html#getLastCommitAttempt--">getLastCommitAttempt()</a></span> - Method in interface org.eclipse.emf.cdo.spi.server.<a href="org/eclipse/emf/cdo/spi/server/InternalTransaction.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalTransaction</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getLastCommitOfBranch-org.eclipse.emf.cdo.common.branch.CDOBranch-boolean-">getLastCommitOfBranch(CDOBranch, boolean)</a></span> - Method in interface org.eclipse.emf.cdo.common.commit.<a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfoManager</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/IStore.html#getLastCommitTime--">getLastCommitTime()</a></span> - Method in interface org.eclipse.emf.cdo.server.<a href="org/eclipse/emf/cdo/server/IStore.html" title="interface in org.eclipse.emf.cdo.server">IStore</a></dt>
<dd>
<div class="block">Returns the time stamp of the last successful commit operation.</div>
@@ -13218,6 +13329,12 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/server/InternalLockManager.html#getLockStates--">getLockStates()</a></span> - Method in interface org.eclipse.emf.cdo.spi.server.<a href="org/eclipse/emf/cdo/spi/server/InternalLockManager.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalLockManager</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#getLockStates-java.util.Collection-">getLockStates(Collection&lt;CDOID&gt;)</a></span> - Method in class org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/view/CDOView.html#getLockStates-java.util.Collection-">getLockStates(Collection&lt;CDOID&gt;)</a></span> - Method in interface org.eclipse.emf.cdo.view.<a href="org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view">CDOView</a></dt>
+<dd>
+<div class="block">Get an array of <a href="org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock"><code>lock states</code></a> corresponding to the specified collection of <a href="org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id"><code>ids</code></a>.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#getLockStates-int-java.util.Collection-">getLockStates(int, Collection&lt;CDOID&gt;)</a></span> - Method in interface org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.html" title="interface in org.eclipse.emf.spi.cdo">CDOSessionProtocol</a></dt>
<dd>
<div class="block"><span class="deprecatedLabel">Deprecated.</span>
@@ -13226,9 +13343,11 @@
</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#getLockStates-int-java.util.Collection-int-">getLockStates(int, Collection&lt;CDOID&gt;, int)</a></span> - Method in interface org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.html" title="interface in org.eclipse.emf.spi.cdo">CDOSessionProtocol</a></dt>
<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOView.html#getLockStates-java.util.Collection-">getLockStates(Collection&lt;CDOID&gt;)</a></span> - Method in interface org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOView.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOView</a></dt>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#getLockStatesOfObjects-java.util.Collection-">getLockStatesOfObjects(Collection&lt;? extends CDOObject&gt;)</a></span> - Method in class org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/view/CDOView.html#getLockStatesOfObjects-java.util.Collection-">getLockStatesOfObjects(Collection&lt;? extends CDOObject&gt;)</a></span> - Method in interface org.eclipse.emf.cdo.view.<a href="org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view">CDOView</a></dt>
<dd>
-<div class="block">Get an array of <a href="org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock"><code>lock states</code></a> corresponding to the specified collection of <a href="org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id"><code>ids</code></a>.</div>
+<div class="block">Get an array of <a href="org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock"><code>lock states</code></a> corresponding to the specified collection of <a href="org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><code>objects</code></a>.</div>
</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/util/CDOBalancedTree.html#getLockTimeout--">getLockTimeout()</a></span> - Method in class org.eclipse.emf.cdo.util.<a href="org/eclipse/emf/cdo/util/CDOBalancedTree.html" title="class in org.eclipse.emf.cdo.util">CDOBalancedTree</a></dt>
<dd>&nbsp;</dd>
@@ -13343,13 +13462,25 @@
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/expressions/impl/ExpressionsPackageImpl.html#getMemberInvocation_Object--">getMemberInvocation_Object()</a></span> - Method in class org.eclipse.emf.cdo.expressions.impl.<a href="org/eclipse/emf/cdo/expressions/impl/ExpressionsPackageImpl.html" title="class in org.eclipse.emf.cdo.expressions.impl">ExpressionsPackageImpl</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/server/InternalRepository.html#getMergeData-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.net4j.util.om.monitor.OMMonitor-">getMergeData(CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, OMMonitor)</a></span> - Method in interface org.eclipse.emf.cdo.spi.server.<a href="org/eclipse/emf/cdo/spi/server/InternalRepository.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalRepository</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">as of 4.6 use <a href="org/eclipse/emf/cdo/spi/server/InternalRepository.html#getMergeData2-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.net4j.util.om.monitor.OMMonitor-"><code>InternalRepository.getMergeData2(CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, OMMonitor)</code></a>.</span></div>
+</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.html#getMergeData-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-boolean-">getMergeData(CDOBranchPoint, CDOBranchPoint, CDOBranchPoint, boolean)</a></span> - Method in interface org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOSession.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOSession</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.html#getMergeData-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-boolean-">getMergeData(CDOBranchPoint, CDOBranchPoint, CDOBranchPoint, CDOBranchPoint, boolean)</a></span> - Method in interface org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOSession.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOSession</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/server/InternalRepository.html#getMergeData2-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.net4j.util.om.monitor.OMMonitor-">getMergeData2(CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, OMMonitor)</a></span> - Method in interface org.eclipse.emf.cdo.spi.server.<a href="org/eclipse/emf/cdo/spi/server/InternalRepository.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalRepository</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getMergedCommitInfo--">getMergedCommitInfo()</a></span> - Method in interface org.eclipse.emf.cdo.common.commit.<a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html#getMerger--">getMerger()</a></span> - Method in exception org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html" title="class in org.eclipse.emf.cdo.transaction">CDOMerger.ConflictException</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.html#getMerger--">getMerger()</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.html" title="class in org.eclipse.emf.spi.cdo">CDOMergingConflictResolver</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getMergeSource--">getMergeSource()</a></span> - Method in interface org.eclipse.emf.cdo.common.commit.<a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/RepositoryNotFoundException.html#getMessage--">getMessage()</a></span> - Method in exception org.eclipse.emf.cdo.server.<a href="org/eclipse/emf/cdo/server/RepositoryNotFoundException.html" title="class in org.eclipse.emf.cdo.server">RepositoryNotFoundException</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/session/remote/CDORemoteSessionEvent.MessageReceived.html#getMessage--">getMessage()</a></span> - Method in interface org.eclipse.emf.cdo.session.remote.<a href="org/eclipse/emf/cdo/session/remote/CDORemoteSessionEvent.MessageReceived.html" title="interface in org.eclipse.emf.cdo.session.remote">CDORemoteSessionEvent.MessageReceived</a></dt>
@@ -14019,6 +14150,10 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/CDOServerBrowser.html#getParam-java.lang.String-">getParam(String)</a></span> - Method in class org.eclipse.emf.cdo.server.<a href="org/eclipse/emf/cdo/server/CDOServerBrowser.html" title="class in org.eclipse.emf.cdo.server">CDOServerBrowser</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/util/CDOQueryInfo.html#getParameter-java.lang.String-">getParameter(String)</a></span> - Method in interface org.eclipse.emf.cdo.common.util.<a href="org/eclipse/emf/cdo/common/util/CDOQueryInfo.html" title="interface in org.eclipse.emf.cdo.common.util">CDOQueryInfo</a></dt>
+<dd>
+<div class="block">Returns the value of the named parameter.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/util/CDOQueryInfo.html#getParameters--">getParameters()</a></span> - Method in interface org.eclipse.emf.cdo.common.util.<a href="org/eclipse/emf/cdo/common/util/CDOQueryInfo.html" title="interface in org.eclipse.emf.cdo.common.util">CDOQueryInfo</a></dt>
<dd>
<div class="block">Returns the parameters of this query as a map.</div>
@@ -14270,6 +14405,8 @@
<dd>
<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getPreviousCommitInfo--">getPreviousCommitInfo()</a></span> - Method in interface org.eclipse.emf.cdo.common.commit.<a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getPreviousSavepoint--">getPreviousSavepoint()</a></span> - Method in interface org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOSavepoint.html" title="interface in org.eclipse.emf.cdo.transaction">CDOSavepoint</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOUserSavepoint.html#getPreviousSavepoint--">getPreviousSavepoint()</a></span> - Method in interface org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOUserSavepoint.html" title="interface in org.eclipse.emf.cdo.transaction">CDOUserSavepoint</a></dt>
@@ -15230,6 +15367,10 @@
<dd>
<div class="block">Same as <a href="org/eclipse/emf/cdo/view/CDOQuery.html#getResultAsync-java.lang.Class-"><code>CDOQuery.getResultAsync(Class)</code></a> but tries to infer the return type from the static context.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.MergeDataResult.html#getResultBase--">getResultBase()</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.MergeDataResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.MergeDataResult</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getResultBase--">getResultBase()</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/IQueryContext.html#getResultCount--">getResultCount()</a></span> - Method in interface org.eclipse.emf.cdo.server.<a href="org/eclipse/emf/cdo/server/IQueryContext.html" title="interface in org.eclipse.emf.cdo.server">IQueryContext</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMapping.html#getResultSetValue-java.sql.ResultSet-">getResultSetValue(ResultSet)</a></span> - Method in class org.eclipse.emf.cdo.server.db.mapping.<a href="org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMapping.html" title="class in org.eclipse.emf.cdo.server.db.mapping">AbstractTypeMapping</a></dt>
@@ -15793,6 +15934,8 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getSourceBase--">getSourceBase()</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getSourceBaseInfo--">getSourceBaseInfo()</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/IStoreAccessor.QueryXRefsContext.html#getSourceCandidates--">getSourceCandidates()</a></span> - Method in interface org.eclipse.emf.cdo.server.<a href="org/eclipse/emf/cdo/server/IStoreAccessor.QueryXRefsContext.html" title="interface in org.eclipse.emf.cdo.server">IStoreAccessor.QueryXRefsContext</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getSourceChanges--">getSourceChanges()</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</a></dt>
@@ -15810,6 +15953,12 @@
<div class="block">Returns the source <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EReference.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><code>EReference</code></a> or the source <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EAttribute.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><code>EAttribute</code></a> if the source feature is a
<a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/util/FeatureMap.html?is-external=true" title="class or interface in org.eclipse.emf.ecore.util"><code>FeatureMap</code></a>.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/CDOObjectReference.html#getSourceID--">getSourceID()</a></span> - Method in interface org.eclipse.emf.cdo.<a href="org/eclipse/emf/cdo/CDOObjectReference.html" title="interface in org.eclipse.emf.cdo">CDOObjectReference</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.MergeDataResult.html#getSourceIDs--">getSourceIDs()</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.MergeDataResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.MergeDataResult</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getSourceIDs--">getSourceIDs()</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/id/CDOIDReference.html#getSourceIndex--">getSourceIndex()</a></span> - Method in class org.eclipse.emf.cdo.common.id.<a href="org/eclipse/emf/cdo/common/id/CDOIDReference.html" title="class in org.eclipse.emf.cdo.common.id">CDOIDReference</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/id/CDOReference.html#getSourceIndex--">getSourceIndex()</a></span> - Method in interface org.eclipse.emf.cdo.common.id.<a href="org/eclipse/emf/cdo/common/id/CDOReference.html" title="interface in org.eclipse.emf.cdo.common.id">CDOReference</a></dt>
@@ -16027,6 +16176,10 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getTarget--">getTarget()</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getTargetBase--">getTargetBase()</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getTargetBaseInfo--">getTargetBaseInfo()</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Available.Pointer.html#getTargetBranchVersion--">getTargetBranchVersion()</a></span> - Method in class org.eclipse.emf.cdo.spi.common.revision.<a href="org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Available.Pointer.html" title="class in org.eclipse.emf.cdo.spi.common.revision">RevisionInfo.Available.Pointer</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getTargetChanges--">getTargetChanges()</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</a></dt>
@@ -16037,6 +16190,12 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transfer/ui/TransferDropAdapter.html#getTargetElement-java.lang.Object-">getTargetElement(Object)</a></span> - Method in class org.eclipse.emf.cdo.transfer.ui.<a href="org/eclipse/emf/cdo/transfer/ui/TransferDropAdapter.html" title="class in org.eclipse.emf.cdo.transfer.ui">TransferDropAdapter</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/CDOObjectReference.html#getTargetID--">getTargetID()</a></span> - Method in interface org.eclipse.emf.cdo.<a href="org/eclipse/emf/cdo/CDOObjectReference.html" title="interface in org.eclipse.emf.cdo">CDOObjectReference</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.MergeDataResult.html#getTargetIDs--">getTargetIDs()</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.MergeDataResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.MergeDataResult</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getTargetIDs--">getTargetIDs()</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getTargetInfo--">getTargetInfo()</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#getTargetMap--">getTargetMap()</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/DefaultCDOMerger.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger</a></dt>
@@ -16319,6 +16478,8 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.html#getTimeProvider--">getTimeProvider()</a></span> - Method in interface org.eclipse.emf.cdo.spi.common.branch.<a href="org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.html" title="interface in org.eclipse.emf.cdo.spi.common.branch">InternalCDOBranchManager</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/server/InternalRepository.html#getTimeProvider--">getTimeProvider()</a></span> - Method in interface org.eclipse.emf.cdo.spi.server.<a href="org/eclipse/emf/cdo/spi/server/InternalRepository.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalRepository</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/net4j/FailoverAgent.html#getTimer--">getTimer()</a></span> - Method in class org.eclipse.emf.cdo.server.net4j.<a href="org/eclipse/emf/cdo/server/net4j/FailoverAgent.html" title="class in org.eclipse.emf.cdo.server.net4j">FailoverAgent</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/ui/widgets/SelectTimeStampComposite.html#getTimeRadio--">getTimeRadio()</a></span> - Method in class org.eclipse.emf.cdo.ui.widgets.<a href="org/eclipse/emf/cdo/ui/widgets/SelectTimeStampComposite.html" title="class in org.eclipse.emf.cdo.ui.widgets">SelectTimeStampComposite</a></dt>
@@ -16340,6 +16501,10 @@
</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/util/CDOTimeProvider.html#getTimeStamp--">getTimeStamp()</a></span> - Method in interface org.eclipse.emf.cdo.common.util.<a href="org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOTimeProvider</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/util/CountedTimeProvider.html#getTimeStamp--">getTimeStamp()</a></span> - Method in class org.eclipse.emf.cdo.common.util.<a href="org/eclipse/emf/cdo/common/util/CountedTimeProvider.html" title="class in org.eclipse.emf.cdo.common.util">CountedTimeProvider</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/util/CurrentTimeProvider.html#getTimeStamp--">getTimeStamp()</a></span> - Method in class org.eclipse.emf.cdo.common.util.<a href="org/eclipse/emf/cdo/common/util/CurrentTimeProvider.html" title="class in org.eclipse.emf.cdo.common.util">CurrentTimeProvider</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/eresource/CDOResource.html#getTimeStamp--">getTimeStamp()</a></span> - Method in interface org.eclipse.emf.cdo.eresource.<a href="org/eclipse/emf/cdo/eresource/CDOResource.html" title="interface in org.eclipse.emf.cdo.eresource">CDOResource</a></dt>
<dd>
<div class="block">Returns the value of the '<em><b>Time Stamp</b></em>' attribute.</div>
@@ -16403,6 +16568,8 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.UnlockObjectsResult.html#getTimestamp--">getTimestamp()</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.UnlockObjectsResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.UnlockObjectsResult</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.LabelProvider.html#getTimeStampString-long-">getTimeStampString(long)</a></span> - Method in class org.eclipse.emf.cdo.ui.widgets.<a href="org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.LabelProvider.html" title="class in org.eclipse.emf.cdo.ui.widgets">CommitHistoryComposite.LabelProvider</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/ui/widgets/SelectTimeStampComposite.html#getTimeText--">getTimeText()</a></span> - Method in class org.eclipse.emf.cdo.ui.widgets.<a href="org/eclipse/emf/cdo/ui/widgets/SelectTimeStampComposite.html" title="class in org.eclipse.emf.cdo.ui.widgets">SelectTimeStampComposite</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/ui/compare/CDOCompareEditorUtil.Input.html#getTitleImage--">getTitleImage()</a></span> - Method in class org.eclipse.emf.cdo.ui.compare.<a href="org/eclipse/emf/cdo/ui/compare/CDOCompareEditorUtil.Input.html" title="class in org.eclipse.emf.cdo.ui.compare">CDOCompareEditorUtil.Input</a></dt>
@@ -16909,6 +17076,8 @@
</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/revision/CDOIDAndVersion.html#getVersion--">getVersion()</a></span> - Method in interface org.eclipse.emf.cdo.common.revision.<a href="org/eclipse/emf/cdo/common/revision/CDOIDAndVersion.html" title="interface in org.eclipse.emf.cdo.common.revision">CDOIDAndVersion</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/util/CDOVersionProvider.html#getVersion--">getVersion()</a></span> - Method in interface org.eclipse.emf.cdo.common.util.<a href="org/eclipse/emf/cdo/common/util/CDOVersionProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOVersionProvider</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.html#getVersion--">getVersion()</a></span> - Method in class org.eclipse.emf.cdo.spi.common.revision.<a href="org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">BaseCDORevision</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevision.html#getVersion--">getVersion()</a></span> - Method in class org.eclipse.emf.cdo.spi.common.revision.<a href="org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">DelegatingCDORevision</a></dt>
@@ -17285,6 +17454,8 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/CDOServerImporter.Handler.html#handleCommitInfo-long-long-int-java.lang.String-java.lang.String-">handleCommitInfo(long, long, int, String, String)</a></span> - Method in interface org.eclipse.emf.cdo.server.<a href="org/eclipse/emf/cdo/server/CDOServerImporter.Handler.html" title="interface in org.eclipse.emf.cdo.server">CDOServerImporter.Handler</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/CDOServerImporter.Handler2.html#handleCommitInfo-long-long-int-java.lang.String-java.lang.String-int-long-">handleCommitInfo(long, long, int, String, String, int, long)</a></span> - Method in interface org.eclipse.emf.cdo.server.<a href="org/eclipse/emf/cdo/server/CDOServerImporter.Handler2.html" title="interface in org.eclipse.emf.cdo.server">CDOServerImporter.Handler2</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.html#handleCommitNotification-org.eclipse.emf.cdo.common.commit.CDOCommitInfo-">handleCommitNotification(CDOCommitInfo)</a></span> - Method in interface org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOSession.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOSession</a></dt>
<dd>
<div class="block"><span class="deprecatedLabel">Deprecated.</span>
@@ -17440,6 +17611,14 @@
</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOTransaction.html#handleRollback-org.eclipse.emf.spi.cdo.InternalCDOSavepoint-">handleRollback(InternalCDOSavepoint)</a></span> - Method in interface org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOTransaction.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOTransaction</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.Handler.html#handleSegment-org.eclipse.emf.cdo.spi.common.commit.CDOChangeSetSegment-">handleSegment(CDOChangeSetSegment)</a></span> - Method in interface org.eclipse.emf.cdo.spi.common.commit.<a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.Handler.html" title="interface in org.eclipse.emf.cdo.spi.common.commit">CDOChangeSetSegment.Handler</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html#handleSegments-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.spi.common.commit.CDOChangeSetSegment.Handler-">handleSegments(CDOBranchPoint, CDOChangeSetSegment.Handler)</a></span> - Static method in class org.eclipse.emf.cdo.spi.common.commit.<a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDOChangeSetSegment</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html#handleSegments-long-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.spi.common.commit.CDOChangeSetSegment.Handler-">handleSegments(long, CDOBranchPoint, CDOChangeSetSegment.Handler)</a></span> - Static method in class org.eclipse.emf.cdo.spi.common.commit.<a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDOChangeSetSegment</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html#handleSegments-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.spi.common.commit.CDOChangeSetSegment.Handler-">handleSegments(CDOBranchPoint, CDOBranchPoint, CDOChangeSetSegment.Handler)</a></span> - Static method in class org.eclipse.emf.cdo.spi.common.commit.<a href="org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDOChangeSetSegment</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOTransaction.html#handleSetSavepoint--">handleSetSavepoint()</a></span> - Method in interface org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOTransaction.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOTransaction</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/IRepository.WriteAccessHandler.html#handleTransactionAfterCommitted-org.eclipse.emf.cdo.server.ITransaction-org.eclipse.emf.cdo.server.IStoreAccessor.CommitContext-org.eclipse.net4j.util.om.monitor.OMMonitor-">handleTransactionAfterCommitted(ITransaction, IStoreAccessor.CommitContext, OMMonitor)</a></span> - Method in interface org.eclipse.emf.cdo.server.<a href="org/eclipse/emf/cdo/server/IRepository.WriteAccessHandler.html" title="interface in org.eclipse.emf.cdo.server">IRepository.WriteAccessHandler</a></dt>
@@ -17986,6 +18165,8 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.html#INSTANCE">INSTANCE</a></span> - Static variable in class org.eclipse.emf.cdo.common.model.<a href="org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.html" title="class in org.eclipse.emf.cdo.common.model">CDOPackageTypeRegistry</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/util/CurrentTimeProvider.html#INSTANCE">INSTANCE</a></span> - Static variable in class org.eclipse.emf.cdo.common.util.<a href="org/eclipse/emf/cdo/common/util/CurrentTimeProvider.html" title="class in org.eclipse.emf.cdo.common.util">CurrentTimeProvider</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/edit/CDOEditPlugin.html#INSTANCE">INSTANCE</a></span> - Static variable in class org.eclipse.emf.cdo.edit.<a href="org/eclipse/emf/cdo/edit/CDOEditPlugin.html" title="class in org.eclipse.emf.cdo.edit">CDOEditPlugin</a></dt>
<dd>
<div class="block">Keep track of the singleton.</div>
@@ -19173,6 +19354,8 @@
</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/model/CDOModelUtil.html#isLob-org.eclipse.emf.ecore.EClassifier-">isLob(EClassifier)</a></span> - Static method in class org.eclipse.emf.cdo.common.model.<a href="org/eclipse/emf/cdo/common/model/CDOModelUtil.html" title="class in org.eclipse.emf.cdo.common.model">CDOModelUtil</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/CDOState.html#isLocal--">isLocal()</a></span> - Method in enum org.eclipse.emf.cdo.<a href="org/eclipse/emf/cdo/CDOState.html" title="enum in org.eclipse.emf.cdo">CDOState</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/branch/CDOBranch.html#isLocal--">isLocal()</a></span> - Method in interface org.eclipse.emf.cdo.common.branch.<a href="org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a></dt>
<dd>
<div class="block">Returns <code>true</code> if this branch is a local branch, <code>false</code> otherwise.</div>
@@ -19375,6 +19558,8 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transfer/CDOTransferSystem.html#isReadOnly--">isReadOnly()</a></span> - Method in class org.eclipse.emf.cdo.transfer.<a href="org/eclipse/emf/cdo/transfer/CDOTransferSystem.html" title="class in org.eclipse.emf.cdo.transfer">CDOTransferSystem</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/CDOState.html#isRemote--">isRemote()</a></span> - Method in enum org.eclipse.emf.cdo.<a href="org/eclipse/emf/cdo/CDOState.html" title="enum in org.eclipse.emf.cdo">CDOState</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/explorer/repositories/CDORepository.html#isRemote--">isRemote()</a></span> - Method in interface org.eclipse.emf.cdo.explorer.repositories.<a href="org/eclipse/emf/cdo/explorer/repositories/CDORepository.html" title="interface in org.eclipse.emf.cdo.explorer.repositories">CDORepository</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.html#isRemote--">isRemote()</a></span> - Method in interface org.eclipse.emf.cdo.session.<a href="org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.html" title="interface in org.eclipse.emf.cdo.session">CDOSessionInvalidationEvent</a></dt>
@@ -19500,6 +19685,10 @@
<dd>
<div class="block">Returns <code>true</code> if the session for this configuration is currently open, <code>false</code> otherwise.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.LabelProvider.html#isShortenBranchPaths--">isShortenBranchPaths()</a></span> - Method in class org.eclipse.emf.cdo.ui.widgets.<a href="org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.LabelProvider.html" title="class in org.eclipse.emf.cdo.ui.widgets">CommitHistoryComposite.LabelProvider</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.html#isShowMerges--">isShowMerges()</a></span> - Method in class org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.html" title="class in org.eclipse.emf.cdo.transaction">CDOTransactionCommentator</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/server/InternalRepository.html#isSkipInitialization--">isSkipInitialization()</a></span> - Method in interface org.eclipse.emf.cdo.spi.server.<a href="org/eclipse/emf/cdo/spi/server/InternalRepository.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalRepository</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.CDOPropertyDescriptor.html#isSortChoices-java.lang.Object-">isSortChoices(Object)</a></span> - Method in class org.eclipse.emf.cdo.edit.<a href="org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.CDOPropertyDescriptor.html" title="class in org.eclipse.emf.cdo.edit">CDOItemProviderAdapter.CDOPropertyDescriptor</a></dt>
@@ -19665,6 +19854,11 @@
<div class="block">An extension interface for <a href="org/eclipse/emf/cdo/server/IStoreAccessor.html" title="interface in org.eclipse.emf.cdo.server"><code>store accessors</code></a> that support <i>raw data access</i> as needed by
<a href="org/eclipse/emf/cdo/server/IRepositorySynchronizer.html" title="interface in org.eclipse.emf.cdo.server"><code>repository synchronizers</code></a> or <a href="org/eclipse/emf/cdo/server/CDOServerImporter.html" title="class in org.eclipse.emf.cdo.server"><code>server importers</code></a>.</div>
</dd>
+<dt><a href="org/eclipse/emf/cdo/server/IStoreAccessor.Raw2.html" title="interface in org.eclipse.emf.cdo.server"><span class="typeNameLink">IStoreAccessor.Raw2</span></a> - Interface in <a href="org/eclipse/emf/cdo/server/package-summary.html">org.eclipse.emf.cdo.server</a></dt>
+<dd>
+<div class="block">An extension interface for <a href="org/eclipse/emf/cdo/server/IStoreAccessor.html" title="interface in org.eclipse.emf.cdo.server"><code>store accessors</code></a> that support <i>raw data access</i> as needed by
+ <a href="org/eclipse/emf/cdo/server/IRepositorySynchronizer.html" title="interface in org.eclipse.emf.cdo.server"><code>repository synchronizers</code></a> or <a href="org/eclipse/emf/cdo/server/CDOServerImporter.html" title="class in org.eclipse.emf.cdo.server"><code>server importers</code></a>.</div>
+</dd>
<dt><a href="org/eclipse/emf/cdo/server/IStoreAccessor.UnitSupport.html" title="interface in org.eclipse.emf.cdo.server"><span class="typeNameLink">IStoreAccessor.UnitSupport</span></a> - Interface in <a href="org/eclipse/emf/cdo/server/package-summary.html">org.eclipse.emf.cdo.server</a></dt>
<dd>
<div class="block">An extension interface for <a href="org/eclipse/emf/cdo/server/IStoreAccessor.html" title="interface in org.eclipse.emf.cdo.server"><code>store accessors</code></a> that support <i>units</i>.</div>
@@ -20159,6 +20353,12 @@
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#loadLob-org.eclipse.emf.cdo.common.lob.CDOLobInfo-java.lang.Object-">loadLob(CDOLobInfo, Object)</a></span> - Method in interface org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.html" title="interface in org.eclipse.emf.spi.cdo">CDOSessionProtocol</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#loadMergeData-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-">loadMergeData(CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo)</a></span> - Method in interface org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.html" title="interface in org.eclipse.emf.spi.cdo">CDOSessionProtocol</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">As of 4.6 use <a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#loadMergeData2-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-"><code>CDOSessionProtocol.loadMergeData2(CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo)</code></a>.</span></div>
+</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#loadMergeData2-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-">loadMergeData2(CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo)</a></span> - Method in interface org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.html" title="interface in org.eclipse.emf.spi.cdo">CDOSessionProtocol</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionManager.RevisionLoader2.html#loadObjectLifetime-org.eclipse.emf.cdo.common.id.CDOID-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">loadObjectLifetime(CDOID, CDOBranchPoint)</a></span> - Method in interface org.eclipse.emf.cdo.spi.common.revision.<a href="org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionManager.RevisionLoader2.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevisionManager.RevisionLoader2</a></dt>
<dd>&nbsp;</dd>
@@ -20566,14 +20766,34 @@
</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOMerger2.html#merge-org.eclipse.emf.cdo.transaction.CDOTransaction-org.eclipse.emf.cdo.view.CDOView-java.util.Set-">merge(CDOTransaction, CDOView, Set&lt;CDOID&gt;)</a></span> - Method in interface org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOMerger2.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger2</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranch-org.eclipse.emf.cdo.transaction.CDOMerger-">merge(CDOBranch, CDOMerger)</a></span> - Method in class org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge(CDOBranchPoint, CDOMerger)</a></span> - Method in class org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge(CDOBranchPoint, CDOBranchPoint, CDOMerger)</a></span> - Method in class org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</a></dt>
<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge(CDOBranchPoint, CDOMerger)</a></span> - Method in interface org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a></dt>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge(CDOBranchPoint, CDOBranchPoint, CDOBranchPoint, CDOMerger)</a></span> - Method in class org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranch-org.eclipse.emf.cdo.transaction.CDOMerger-">merge(CDOBranch, CDOMerger)</a></span> - Method in interface org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a></dt>
+<dd>
+<div class="block">Merges the changes from the given source branch into this transaction and possibly considers previous merges
+ from that branch by inspecting the <a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getMergeSource--"><code>merge source</code></a>
+ information of the <a href="org/eclipse/emf/cdo/session/CDOSession.html#getCommitInfoManager--"><code>commit history</code></a>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge(CDOBranchPoint, CDOMerger)</a></span> - Method in interface org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a></dt>
+<dd>
+<div class="block">Merges the changes from the given source point into this transaction and possibly considers previous merges
+ from that <a href="org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getBranch--"><code>branch</code></a> by inspecting the <a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getMergeSource--"><code>merge source</code></a>
+ information of the <a href="org/eclipse/emf/cdo/session/CDOSession.html#getCommitInfoManager--"><code>commit history</code></a>.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge(CDOBranchPoint, CDOBranchPoint, CDOMerger)</a></span> - Method in interface org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Merges the changes between the given source base point and the given source point into this transaction.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge(CDOBranchPoint, CDOBranchPoint, CDOBranchPoint, CDOMerger)</a></span> - Method in interface org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a></dt>
+<dd>
+<div class="block">Merges the changes between the given source base point and the given source point into this transaction.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/workspace/CDOWorkspace.html#merge-org.eclipse.emf.cdo.transaction.CDOMerger-java.lang.String-">merge(CDOMerger, String)</a></span> - Method in interface org.eclipse.emf.cdo.workspace.<a href="org/eclipse/emf/cdo/workspace/CDOWorkspace.html" title="interface in org.eclipse.emf.cdo.workspace">CDOWorkspace</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/workspace/CDOWorkspace.html#merge-org.eclipse.emf.cdo.transaction.CDOMerger-java.lang.String-long-">merge(CDOMerger, String, long)</a></span> - Method in interface org.eclipse.emf.cdo.workspace.<a href="org/eclipse/emf/cdo/workspace/CDOWorkspace.html" title="interface in org.eclipse.emf.cdo.workspace">CDOWorkspace</a></dt>
@@ -20582,7 +20802,21 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#merge-java.lang.Object-java.lang.Object-">merge(Object, Object)</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/DefaultCDOMerger.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.html#MERGE_PREFIX">MERGE_PREFIX</a></span> - Static variable in class org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.html" title="class in org.eclipse.emf.cdo.transaction">CDOTransactionCommentator</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/CDOServerExporter.XMLConstants.html#MERGE_SOURCE_BRANCH">MERGE_SOURCE_BRANCH</a></span> - Static variable in interface org.eclipse.emf.cdo.server.<a href="org/eclipse/emf/cdo/server/CDOServerExporter.XMLConstants.html" title="interface in org.eclipse.emf.cdo.server">CDOServerExporter.XMLConstants</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/CDOServerExporter.XMLConstants.html#MERGE_SOURCE_TIME">MERGE_SOURCE_TIME</a></span> - Static variable in interface org.eclipse.emf.cdo.server.<a href="org/eclipse/emf/cdo/server/CDOServerExporter.XMLConstants.html" title="interface in org.eclipse.emf.cdo.server">CDOServerExporter.XMLConstants</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#MergeData-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-java.util.Set-org.eclipse.emf.cdo.common.commit.CDOChangeSet-org.eclipse.emf.cdo.common.commit.CDOChangeSet-">MergeData(CDOBranchPoint, CDOBranchPoint, CDOBranchPoint, CDOBranchPoint, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, Set&lt;CDOID&gt;, CDOChangeSet, CDOChangeSet)</a></span> - Constructor for class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">As of 4.6 use <code>#MergeData(CDOBranchPoint, CDORevisionAvailabilityInfo, CDOBranchPoint, CDORevisionAvailabilityInfo, Set, CDOChangeSet, CDOBranchPoint, CDORevisionAvailabilityInfo, CDOBranchPoint, CDORevisionAvailabilityInfo, Set, CDOChangeSet, CDOBranchPoint)</code>.</span></div>
+</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#MergeData-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-java.util.Set-org.eclipse.emf.cdo.common.commit.CDOChangeSet-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-java.util.Set-org.eclipse.emf.cdo.common.commit.CDOChangeSet-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">MergeData(CDOBranchPoint, CDORevisionAvailabilityInfo, CDOBranchPoint, CDORevisionAvailabilityInfo, Set&lt;CDOID&gt;, CDOChangeSet, CDOBranchPoint, CDORevisionAvailabilityInfo, CDOBranchPoint, CDORevisionAvailabilityInfo, Set&lt;CDOID&gt;, CDOChangeSet, CDOBranchPoint)</a></span> - Constructor for class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.MergeDataResult.html#MergeDataResult--">MergeDataResult()</a></span> - Constructor for class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.MergeDataResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.MergeDataResult</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.MergeLocalChangesPerFeature.html#MergeLocalChangesPerFeature--">MergeLocalChangesPerFeature()</a></span> - Constructor for class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.MergeLocalChangesPerFeature.html" title="class in org.eclipse.emf.spi.cdo">AbstractObjectConflictResolver.MergeLocalChangesPerFeature</a></dt>
<dd>
@@ -22841,10 +23075,16 @@
</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#queryInstancesAsync-org.eclipse.emf.ecore.EClass-">queryInstancesAsync(EClass)</a></span> - Method in class org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#queryInstancesAsync-org.eclipse.emf.ecore.EClass-boolean-">queryInstancesAsync(EClass, boolean)</a></span> - Method in class org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/view/CDOView.html#queryInstancesAsync-org.eclipse.emf.ecore.EClass-">queryInstancesAsync(EClass)</a></span> - Method in interface org.eclipse.emf.cdo.view.<a href="org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view">CDOView</a></dt>
<dd>
<div class="block">Returns an iterator over the instances of the given type.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/view/CDOView.html#queryInstancesAsync-org.eclipse.emf.ecore.EClass-boolean-">queryInstancesAsync(EClass, boolean)</a></span> - Method in interface org.eclipse.emf.cdo.view.<a href="org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view">CDOView</a></dt>
+<dd>
+<div class="block">Returns an iterator over the instances of the given type.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/IStoreAccessor.html#queryLobs-java.util.List-">queryLobs(List&lt;byte[]&gt;)</a></span> - Method in interface org.eclipse.emf.cdo.server.<a href="org/eclipse/emf/cdo/server/IStoreAccessor.html" title="interface in org.eclipse.emf.cdo.server">IStoreAccessor</a></dt>
<dd>
<div class="block">Determines which of the large objects identified by the given <a href="org/eclipse/emf/cdo/common/lob/CDOLobInfo.html#getID--"><code>IDs</code></a> are known in the backend
@@ -22976,6 +23216,11 @@
<div class="block">Stores the given <a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit"><code>commit</code></a> in the backend represented by this <a href="org/eclipse/emf/cdo/server/IStoreAccessor.Raw.html" title="interface in org.eclipse.emf.cdo.server"><code>raw
store accessor</code></a> without going through a regular <a href="org/eclipse/emf/cdo/server/IStoreAccessor.html#commit-org.eclipse.net4j.util.om.monitor.OMMonitor-"><code>commit</code></a>.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/IStoreAccessor.Raw2.html#rawStore-org.eclipse.emf.cdo.common.branch.CDOBranch-long-long-java.lang.String-java.lang.String-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.net4j.util.om.monitor.OMMonitor-">rawStore(CDOBranch, long, long, String, String, CDOBranchPoint, OMMonitor)</a></span> - Method in interface org.eclipse.emf.cdo.server.<a href="org/eclipse/emf/cdo/server/IStoreAccessor.Raw2.html" title="interface in org.eclipse.emf.cdo.server">IStoreAccessor.Raw2</a></dt>
+<dd>
+<div class="block">Stores the given <a href="org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit"><code>commit</code></a> in the backend represented by this <a href="org/eclipse/emf/cdo/server/IStoreAccessor.Raw.html" title="interface in org.eclipse.emf.cdo.server"><code>raw
+ store accessor</code></a> without going through a regular <a href="org/eclipse/emf/cdo/server/IStoreAccessor.html#commit-org.eclipse.net4j.util.om.monitor.OMMonitor-"><code>commit</code></a>.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/id/CDOIDUtil.html#read-java.lang.String-">read(String)</a></span> - Static method in class org.eclipse.emf.cdo.common.id.<a href="org/eclipse/emf/cdo/common/id/CDOIDUtil.html" title="class in org.eclipse.emf.cdo.common.id">CDOIDUtil</a></dt>
<dd>
<div class="block">Format of the URI fragment.</div>
@@ -23028,6 +23273,8 @@
</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/lob/CDOLobUtil.html#readBlob-org.eclipse.net4j.util.io.ExtendedDataInput-">readBlob(ExtendedDataInput)</a></span> - Static method in class org.eclipse.emf.cdo.common.lob.<a href="org/eclipse/emf/cdo/common/lob/CDOLobUtil.html" title="class in org.eclipse.emf.cdo.common.lob">CDOLobUtil</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html#readBranchPointOrNull-org.eclipse.emf.cdo.common.protocol.CDODataInput-">readBranchPointOrNull(CDODataInput)</a></span> - Static method in class org.eclipse.emf.cdo.spi.common.branch.<a href="org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html" title="class in org.eclipse.emf.cdo.spi.common.branch">CDOBranchUtil</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/protocol/CDODataInput.html#readCDOBranch--">readCDOBranch()</a></span> - Method in interface org.eclipse.emf.cdo.common.protocol.<a href="org/eclipse/emf/cdo/common/protocol/CDODataInput.html" title="interface in org.eclipse.emf.cdo.common.protocol">CDODataInput</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/protocol/CDODataInputImpl.html#readCDOBranch--">readCDOBranch()</a></span> - Method in class org.eclipse.emf.cdo.spi.common.protocol.<a href="org/eclipse/emf/cdo/spi/common/protocol/CDODataInputImpl.html" title="class in org.eclipse.emf.cdo.spi.common.protocol">CDODataInputImpl</a></dt>
@@ -23236,6 +23483,10 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/ocl/OCLQueryHandler.html#readParameters-java.util.Map-">readParameters(Map&lt;String, ?&gt;)</a></span> - Method in class org.eclipse.emf.cdo.server.ocl.<a href="org/eclipse/emf/cdo/server/ocl/OCLQueryHandler.html" title="class in org.eclipse.emf.cdo.server.ocl">OCLQueryHandler</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html#readRange-org.eclipse.emf.cdo.common.protocol.CDODataInput-">readRange(CDODataInput)</a></span> - Static method in class org.eclipse.emf.cdo.spi.common.branch.<a href="org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html" title="class in org.eclipse.emf.cdo.spi.common.branch">CDOBranchUtil</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html#readRangeOrNull-org.eclipse.emf.cdo.common.protocol.CDODataInput-">readRangeOrNull(CDODataInput)</a></span> - Static method in class org.eclipse.emf.cdo.spi.common.branch.<a href="org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html" title="class in org.eclipse.emf.cdo.spi.common.branch">CDOBranchUtil</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/IStoreAccessor.html#readResourceID-org.eclipse.emf.cdo.common.id.CDOID-java.lang.String-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">readResourceID(CDOID, String, CDOBranchPoint)</a></span> - Method in interface org.eclipse.emf.cdo.server.<a href="org/eclipse/emf/cdo/server/IStoreAccessor.html" title="interface in org.eclipse.emf.cdo.server">IStoreAccessor</a></dt>
<dd>
<div class="block">Returns the <code>CDOID</code> of the resource node with the given folderID and name if a resource with this
@@ -23480,6 +23731,8 @@
</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.html#refreshLayout--">refreshLayout()</a></span> - Method in class org.eclipse.emf.cdo.ui.widgets.<a href="org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.html" title="class in org.eclipse.emf.cdo.ui.widgets">CommitHistoryComposite</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.html#refreshLayout-boolean-">refreshLayout(boolean)</a></span> - Method in class org.eclipse.emf.cdo.ui.widgets.<a href="org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.html" title="class in org.eclipse.emf.cdo.ui.widgets">CommitHistoryComposite</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.RefreshSessionResult.html#RefreshSessionResult-long-">RefreshSessionResult(long)</a></span> - Constructor for class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.RefreshSessionResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.RefreshSessionResult</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/ui/CDOEventHandler.html#refreshTreeViewer--">refreshTreeViewer()</a></span> - Method in class org.eclipse.emf.cdo.ui.<a href="org/eclipse/emf/cdo/ui/CDOEventHandler.html" title="class in org.eclipse.emf.cdo.ui">CDOEventHandler</a></dt>
@@ -25056,6 +25309,8 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/explorer/checkouts/CDOCheckout.html#setBranchPoint-int-long-">setBranchPoint(int, long)</a></span> - Method in interface org.eclipse.emf.cdo.explorer.checkouts.<a href="org/eclipse/emf/cdo/explorer/checkouts/CDOCheckout.html" title="interface in org.eclipse.emf.cdo.explorer.checkouts">CDOCheckout</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html#setBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">setBranchPoint(CDOBranchPoint)</a></span> - Method in class org.eclipse.emf.cdo.spi.common.commit.<a href="org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.html#setBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">setBranchPoint(CDOBranchPoint)</a></span> - Method in class org.eclipse.emf.cdo.spi.common.revision.<a href="org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">BaseCDORevision</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevision.html#setBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">setBranchPoint(CDOBranchPoint)</a></span> - Method in class org.eclipse.emf.cdo.spi.common.revision.<a href="org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">DelegatingCDORevision</a></dt>
@@ -25152,6 +25407,10 @@
<dd>
<div class="block">Specifies the number of milliseconds to wait for the transaction update when <a href="org/eclipse/emf/cdo/transaction/CDOUserTransaction.html#commit--"><code>CDOUserTransaction.commit()</code></a> is called.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/server/InternalCommitContext.html#setCommitMergeSource-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">setCommitMergeSource(CDOBranchPoint)</a></span> - Method in interface org.eclipse.emf.cdo.spi.server.<a href="org/eclipse/emf/cdo/spi/server/InternalCommitContext.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalCommitContext</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOTransaction.html#setCommitMergeSource-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">setCommitMergeSource(CDOBranchPoint)</a></span> - Method in interface org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOTransaction.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOTransaction</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/server/InternalCommitContext.html#setCommitNumber-int-">setCommitNumber(int)</a></span> - Method in interface org.eclipse.emf.cdo.spi.server.<a href="org/eclipse/emf/cdo/spi/server/InternalCommitContext.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalCommitContext</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#setCommittables-java.util.Set-">setCommittables(Set&lt;? extends EObject&gt;)</a></span> - Method in class org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</a></dt>
@@ -25216,7 +25475,7 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/view/CDOQuery.html#setContext-java.lang.Object-">setContext(Object)</a></span> - Method in interface org.eclipse.emf.cdo.view.<a href="org/eclipse/emf/cdo/view/CDOQuery.html" title="interface in org.eclipse.emf.cdo.view">CDOQuery</a></dt>
<dd>
-<div class="block">Binds an object as teh context for this query.</div>
+<div class="block">Binds an object as the context for this query.</div>
</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/server/InternalStore.html#setCreationTime-long-">setCreationTime(long)</a></span> - Method in interface org.eclipse.emf.cdo.spi.server.<a href="org/eclipse/emf/cdo/spi/server/InternalStore.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalStore</a></dt>
<dd>&nbsp;</dd>
@@ -25564,6 +25823,8 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/server/InternalTransaction.html#setLastCommitAttempt-org.eclipse.emf.cdo.spi.server.InternalTransaction.CommitAttempt-">setLastCommitAttempt(InternalTransaction.CommitAttempt)</a></span> - Method in interface org.eclipse.emf.cdo.spi.server.<a href="org/eclipse/emf/cdo/spi/server/InternalTransaction.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalTransaction</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/commit/InternalCDOCommitInfoManager.html#setLastCommitOfBranch-org.eclipse.emf.cdo.common.branch.CDOBranch-long-">setLastCommitOfBranch(CDOBranch, long)</a></span> - Method in interface org.eclipse.emf.cdo.spi.common.commit.<a href="org/eclipse/emf/cdo/spi/common/commit/InternalCDOCommitInfoManager.html" title="interface in org.eclipse.emf.cdo.spi.common.commit">InternalCDOCommitInfoManager</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/server/InternalStore.html#setLastCommitTime-long-">setLastCommitTime(long)</a></span> - Method in interface org.eclipse.emf.cdo.spi.server.<a href="org/eclipse/emf/cdo/spi/server/InternalStore.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalStore</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/server/Store.html#setLastCommitTime-long-">setLastCommitTime(long)</a></span> - Method in class org.eclipse.emf.cdo.spi.server.<a href="org/eclipse/emf/cdo/spi/server/Store.html" title="class in org.eclipse.emf.cdo.spi.server">Store</a></dt>
@@ -26146,6 +26407,8 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOXATransaction.InternalCDOXACommitContext.html#setResult-org.eclipse.emf.spi.cdo.CDOSessionProtocol.CommitTransactionResult-">setResult(CDOSessionProtocol.CommitTransactionResult)</a></span> - Method in interface org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOXATransaction.InternalCDOXACommitContext.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOXATransaction.InternalCDOXACommitContext</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.MergeDataResult.html#setResultBase-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">setResultBase(CDOBranchPoint)</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/CDOSessionProtocol.MergeDataResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.MergeDataResult</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/IRepositorySynchronizer.html#setRetryInterval-int-">setRetryInterval(int)</a></span> - Method in interface org.eclipse.emf.cdo.server.<a href="org/eclipse/emf/cdo/server/IRepositorySynchronizer.html" title="interface in org.eclipse.emf.cdo.server">IRepositorySynchronizer</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.html#setRevised-long-">setRevised(long)</a></span> - Method in class org.eclipse.emf.cdo.spi.common.revision.<a href="org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">BaseCDORevision</a></dt>
@@ -26258,6 +26521,10 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/InternalCDOSession.html#setSessionProtocol-org.eclipse.emf.spi.cdo.CDOSessionProtocol-">setSessionProtocol(CDOSessionProtocol)</a></span> - Method in interface org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/InternalCDOSession.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOSession</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.LabelProvider.html#setShortenBranchPaths-boolean-">setShortenBranchPaths(boolean)</a></span> - Method in class org.eclipse.emf.cdo.ui.widgets.<a href="org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.LabelProvider.html" title="class in org.eclipse.emf.cdo.ui.widgets">CommitHistoryComposite.LabelProvider</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.html#setShowMerges-boolean-">setShowMerges(boolean)</a></span> - Method in class org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.html" title="class in org.eclipse.emf.cdo.transaction">CDOTransactionCommentator</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/net4j/CDONet4jSessionConfiguration.html#setSignalTimeout-long-">setSignalTimeout(long)</a></span> - Method in interface org.eclipse.emf.cdo.net4j.<a href="org/eclipse/emf/cdo/net4j/CDONet4jSessionConfiguration.html" title="interface in org.eclipse.emf.cdo.net4j">CDONet4jSessionConfiguration</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/server/InternalRepository.html#setSkipInitialization-boolean-">setSkipInitialization(boolean)</a></span> - Method in interface org.eclipse.emf.cdo.spi.server.<a href="org/eclipse/emf/cdo/spi/server/InternalRepository.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalRepository</a></dt>
@@ -26358,6 +26625,8 @@
<div class="block"><span class="deprecationComment">As of 4.2 replaced by <a href="org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.html#setRepository-org.eclipse.emf.cdo.common.CDOCommonRepository-"><code>InternalCDOBranchManager.setRepository(CDOCommonRepository)</code></a></span></div>
</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/server/InternalRepository.html#setTimeProvider-org.eclipse.emf.cdo.common.util.CDOTimeProvider-">setTimeProvider(CDOTimeProvider)</a></span> - Method in interface org.eclipse.emf.cdo.spi.server.<a href="org/eclipse/emf/cdo/spi/server/InternalRepository.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalRepository</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/net4j/FailoverAgent.html#setTimer-java.util.Timer-">setTimer(Timer)</a></span> - Method in class org.eclipse.emf.cdo.server.net4j.<a href="org/eclipse/emf/cdo/server/net4j/FailoverAgent.html" title="class in org.eclipse.emf.cdo.server.net4j">FailoverAgent</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/eresource/CDOResource.html#setTimeStamp-long-">setTimeStamp(long)</a></span> - Method in interface org.eclipse.emf.cdo.eresource.<a href="org/eclipse/emf/cdo/eresource/CDOResource.html" title="interface in org.eclipse.emf.cdo.eresource">CDOResource</a></dt>
@@ -27564,6 +27833,14 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/revision/CDORevisionHandler.Filtered.Undetached.html#Undetached-org.eclipse.emf.cdo.common.revision.CDORevisionHandler-">Undetached(CDORevisionHandler)</a></span> - Constructor for class org.eclipse.emf.cdo.common.revision.<a href="org/eclipse/emf/cdo/common/revision/CDORevisionHandler.Filtered.Undetached.html" title="class in org.eclipse.emf.cdo.common.revision">CDORevisionHandler.Filtered.Undetached</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler1.html#undoingObject-org.eclipse.emf.cdo.transaction.CDOTransaction-org.eclipse.emf.cdo.CDOObject-org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta-">undoingObject(CDOTransaction, CDOObject, CDOFeatureDelta)</a></span> - Method in class org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler1.html" title="class in org.eclipse.emf.cdo.transaction">CDODefaultTransactionHandler1</a></dt>
+<dd>
+<div class="block">This implementation does nothing.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.WithUndo.html#undoingObject-org.eclipse.emf.cdo.transaction.CDOTransaction-org.eclipse.emf.cdo.CDOObject-org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta-">undoingObject(CDOTransaction, CDOObject, CDOFeatureDelta)</a></span> - Method in interface org.eclipse.emf.cdo.transaction.<a href="org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.WithUndo.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler1.WithUndo</a></dt>
+<dd>
+<div class="block">Called by a <code>CDOTransaction</code> <b>before</b> an object is modified.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/AbstractChangeSetsConflictResolver.html#unhookTransaction-org.eclipse.emf.cdo.transaction.CDOTransaction-">unhookTransaction(CDOTransaction)</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/AbstractChangeSetsConflictResolver.html" title="class in org.eclipse.emf.spi.cdo">AbstractChangeSetsConflictResolver</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/AbstractConflictResolver.html#unhookTransaction-org.eclipse.emf.cdo.transaction.CDOTransaction-">unhookTransaction(CDOTransaction)</a></span> - Method in class org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/AbstractConflictResolver.html" title="class in org.eclipse.emf.spi.cdo">AbstractConflictResolver</a></dt>
@@ -27660,6 +27937,10 @@
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/revision/StubCDORevision.html#unset-org.eclipse.emf.ecore.EStructuralFeature-">unset(EStructuralFeature)</a></span> - Method in class org.eclipse.emf.cdo.spi.common.revision.<a href="org/eclipse/emf/cdo/spi/common/revision/StubCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">StubCDORevision</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/view/CDOQuery.html#unsetParameter-java.lang.String-">unsetParameter(String)</a></span> - Method in interface org.eclipse.emf.cdo.view.<a href="org/eclipse/emf/cdo/view/CDOQuery.html" title="interface in org.eclipse.emf.cdo.view">CDOQuery</a></dt>
+<dd>
+<div class="block">Removes the value of a named parameter.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/util/CDOCrossReferenceAdapter.html#unsetTarget-org.eclipse.emf.common.notify.Notifier-">unsetTarget(Notifier)</a></span> - Method in class org.eclipse.emf.cdo.util.<a href="org/eclipse/emf/cdo/util/CDOCrossReferenceAdapter.html" title="class in org.eclipse.emf.cdo.util">CDOCrossReferenceAdapter</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/util/CDOLazyContentAdapter.html#unsetTarget-org.eclipse.emf.ecore.EObject-">unsetTarget(EObject)</a></span> - Method in class org.eclipse.emf.cdo.util.<a href="org/eclipse/emf/cdo/util/CDOLazyContentAdapter.html" title="class in org.eclipse.emf.cdo.util">CDOLazyContentAdapter</a></dt>
@@ -27669,7 +27950,11 @@
<dt><span class="memberNameLink"><a href="org/eclipse/emf/spi/cdo/CDOTransactionStrategy.html#unsetTarget-org.eclipse.emf.spi.cdo.InternalCDOTransaction-">unsetTarget(InternalCDOTransaction)</a></span> - Method in interface org.eclipse.emf.spi.cdo.<a href="org/eclipse/emf/spi/cdo/CDOTransactionStrategy.html" title="interface in org.eclipse.emf.spi.cdo">CDOTransactionStrategy</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/revision/delta/CDOSetFeatureDelta.html#UNSPECIFIED">UNSPECIFIED</a></span> - Static variable in interface org.eclipse.emf.cdo.common.revision.delta.<a href="org/eclipse/emf/cdo/common/revision/delta/CDOSetFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOSetFeatureDelta</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">As of 4.6 use <a href="org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html#UNKNOWN_VALUE"><code>CDOFeatureDelta.UNKNOWN_VALUE</code></a>.</span></div>
+</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#UNSPECIFIED_DATE">UNSPECIFIED_DATE</a></span> - Static variable in interface org.eclipse.emf.cdo.common.branch.<a href="org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></dt>
<dd>
<div class="block">The fixed special time stamp <i>unspecified</i>.</div>
@@ -28130,6 +28415,10 @@
<dd>
<div class="block">Returns the enum constant of this type with the specified name.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.eclipse.emf.cdo.common.<a href="org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a></dt>
+<dd>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/CDOCommonRepository.IDGenerationLocation.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.eclipse.emf.cdo.common.<a href="org/eclipse/emf/cdo/common/CDOCommonRepository.IDGenerationLocation.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.IDGenerationLocation</a></dt>
<dd>
<div class="block">Returns the enum constant of this type with the specified name.</div>
@@ -28290,6 +28579,11 @@ the order they are declared.</div>
<div class="block">Returns an array containing the constants of this enum type, in
the order they are declared.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html#values--">values()</a></span> - Static method in enum org.eclipse.emf.cdo.common.<a href="org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a></dt>
+<dd>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/CDOCommonRepository.IDGenerationLocation.html#values--">values()</a></span> - Static method in enum org.eclipse.emf.cdo.common.<a href="org/eclipse/emf/cdo/common/CDOCommonRepository.IDGenerationLocation.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.IDGenerationLocation</a></dt>
<dd>
<div class="block">Returns an array containing the constants of this enum type, in
@@ -28751,6 +29045,8 @@ the order they are declared.</div>
</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/server/StoreAccessor.html#writeBlob-byte:A-long-java.io.InputStream-">writeBlob(byte[], long, InputStream)</a></span> - Method in class org.eclipse.emf.cdo.spi.server.<a href="org/eclipse/emf/cdo/spi/server/StoreAccessor.html" title="class in org.eclipse.emf.cdo.spi.server">StoreAccessor</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html#writeBranchPointOrNull-org.eclipse.emf.cdo.common.protocol.CDODataOutput-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">writeBranchPointOrNull(CDODataOutput, CDOBranchPoint)</a></span> - Static method in class org.eclipse.emf.cdo.spi.common.branch.<a href="org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html" title="class in org.eclipse.emf.cdo.spi.common.branch">CDOBranchUtil</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/protocol/CDODataOutput.html#writeCDOBranch-org.eclipse.emf.cdo.common.branch.CDOBranch-">writeCDOBranch(CDOBranch)</a></span> - Method in interface org.eclipse.emf.cdo.common.protocol.<a href="org/eclipse/emf/cdo/common/protocol/CDODataOutput.html" title="interface in org.eclipse.emf.cdo.common.protocol">CDODataOutput</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/protocol/CDODataOutputImpl.html#writeCDOBranch-org.eclipse.emf.cdo.common.branch.CDOBranch-">writeCDOBranch(CDOBranch)</a></span> - Method in class org.eclipse.emf.cdo.spi.common.protocol.<a href="org/eclipse/emf/cdo/spi/common/protocol/CDODataOutputImpl.html" title="class in org.eclipse.emf.cdo.spi.common.protocol">CDODataOutputImpl</a></dt>
@@ -28892,6 +29188,12 @@ the order they are declared.</div>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/common/model/CDOFeatureType.html#writeCombination-java.util.Collection-">writeCombination(Collection&lt;CDOFeatureType&gt;)</a></span> - Static method in enum org.eclipse.emf.cdo.common.model.<a href="org/eclipse/emf/cdo/common/model/CDOFeatureType.html" title="enum in org.eclipse.emf.cdo.common.model">CDOFeatureType</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/server/StoreAccessor.html#writeCommitInfo-org.eclipse.emf.cdo.common.branch.CDOBranch-long-long-java.lang.String-java.lang.String-org.eclipse.net4j.util.om.monitor.OMMonitor-">writeCommitInfo(CDOBranch, long, long, String, String, OMMonitor)</a></span> - Method in class org.eclipse.emf.cdo.spi.server.<a href="org/eclipse/emf/cdo/spi/server/StoreAccessor.html" title="class in org.eclipse.emf.cdo.spi.server">StoreAccessor</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">As of 4.6 override <a href="org/eclipse/emf/cdo/spi/server/StoreAccessor.html#writeCommitInfo-org.eclipse.emf.cdo.common.branch.CDOBranch-long-long-java.lang.String-java.lang.String-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.net4j.util.om.monitor.OMMonitor-"><code>StoreAccessor.writeCommitInfo(CDOBranch, long, long, String, String, CDOBranchPoint, OMMonitor)</code></a>.</span></div>
+</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/server/StoreAccessor.html#writeCommitInfo-org.eclipse.emf.cdo.common.branch.CDOBranch-long-long-java.lang.String-java.lang.String-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.net4j.util.om.monitor.OMMonitor-">writeCommitInfo(CDOBranch, long, long, String, String, CDOBranchPoint, OMMonitor)</a></span> - Method in class org.eclipse.emf.cdo.spi.server.<a href="org/eclipse/emf/cdo/spi/server/StoreAccessor.html" title="class in org.eclipse.emf.cdo.spi.server">StoreAccessor</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/server/StoreAccessor.html#writeDirtyObjectRevisions-org.eclipse.emf.cdo.spi.server.InternalCommitContext-org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision:A-org.eclipse.emf.cdo.common.branch.CDOBranch-org.eclipse.net4j.util.om.monitor.OMMonitor-">writeDirtyObjectRevisions(InternalCommitContext, InternalCDORevision[], CDOBranch, OMMonitor)</a></span> - Method in class org.eclipse.emf.cdo.spi.server.<a href="org/eclipse/emf/cdo/spi/server/StoreAccessor.html" title="class in org.eclipse.emf.cdo.spi.server">StoreAccessor</a></dt>
<dd>&nbsp;</dd>
@@ -28915,6 +29217,10 @@ the order they are declared.</div>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/server/db/IDBStore.Props.html#WRITER_POOL_CAPACITY">WRITER_POOL_CAPACITY</a></span> - Static variable in interface org.eclipse.emf.cdo.server.db.<a href="org/eclipse/emf/cdo/server/db/IDBStore.Props.html" title="interface in org.eclipse.emf.cdo.server.db">IDBStore.Props</a></dt>
<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html#writeRange-org.eclipse.emf.cdo.common.protocol.CDODataOutput-org.eclipse.emf.cdo.common.branch.CDOBranchPointRange-">writeRange(CDODataOutput, CDOBranchPointRange)</a></span> - Static method in class org.eclipse.emf.cdo.spi.common.branch.<a href="org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html" title="class in org.eclipse.emf.cdo.spi.common.branch">CDOBranchUtil</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html#writeRangeOrNull-org.eclipse.emf.cdo.common.protocol.CDODataOutput-org.eclipse.emf.cdo.common.branch.CDOBranchPointRange-">writeRangeOrNull(CDODataOutput, CDOBranchPointRange)</a></span> - Static method in class org.eclipse.emf.cdo.spi.common.branch.<a href="org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html" title="class in org.eclipse.emf.cdo.spi.common.branch">CDOBranchUtil</a></dt>
+<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.html#writeResult-org.eclipse.emf.cdo.common.protocol.CDODataOutput-int-">writeResult(CDODataOutput, int)</a></span> - Method in class org.eclipse.emf.cdo.spi.common.revision.<a href="org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.html" title="class in org.eclipse.emf.cdo.spi.common.revision">RevisionInfo</a></dt>
<dd>
<div class="block"><span class="deprecatedLabel">Deprecated.</span>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/CDOObjectHistory.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/CDOObjectHistory.html
index b2b91c04a2..e5842237d0 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/CDOObjectHistory.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/CDOObjectHistory.html
@@ -100,7 +100,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<dl>
<dt>All Superinterfaces:</dt>
-<dd><a href="../../../../org/eclipse/emf/cdo/common/commit/CDOCommitHistory.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitHistory</a>, <a href="../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoHandler.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfoHandler</a>, <a href="../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.html?is-external=true" title="class or interface in org.eclipse.net4j.util.container">IContainer</a>&lt;<a href="../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a>&gt;, <a href="../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/INotifier.html?is-external=true" title="class or interface in org.eclipse.net4j.util.event">INotifier</a></dd>
+<dd><a href="../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a>, <a href="../../../../org/eclipse/emf/cdo/common/commit/CDOCommitHistory.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitHistory</a>, <a href="../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoHandler.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfoHandler</a>, <a href="../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.html?is-external=true" title="class or interface in org.eclipse.net4j.util.container">IContainer</a>&lt;<a href="../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a>&gt;, <a href="../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/INotifier.html?is-external=true" title="class or interface in org.eclipse.net4j.util.event">INotifier</a></dd>
</dl>
<hr>
<br>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/CDOObjectReference.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/CDOObjectReference.html
index 896cecf64d..6e3a4d2502 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/CDOObjectReference.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/CDOObjectReference.html
@@ -18,6 +18,12 @@
catch(err) {
}
//-->
+var methods = {"i0":6,"i1":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
</script>
<noscript>
<div>JavaScript is disabled on your browser.</div>
@@ -70,13 +76,13 @@
<li>Nested&nbsp;|&nbsp;</li>
<li>Field&nbsp;|&nbsp;</li>
<li>Constr&nbsp;|&nbsp;</li>
-<li>Method</li>
+<li><a href="#method.summary">Method</a></li>
</ul>
<ul class="subNavList">
<li>Detail:&nbsp;</li>
<li>Field&nbsp;|&nbsp;</li>
<li>Constr&nbsp;|&nbsp;</li>
-<li>Method</li>
+<li><a href="#method.detail">Method</a></li>
</ul>
</div>
<a name="skip.navbar.top">
@@ -140,6 +146,21 @@ extends <a href="../../../../org/eclipse/emf/cdo/common/id/CDOReference.html" ti
<!-- -->
</a>
<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/eclipse/emf/cdo/CDOObjectReference.html#getSourceID--">getSourceID</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/eclipse/emf/cdo/CDOObjectReference.html#getTargetID--">getTargetID</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.eclipse.emf.cdo.common.id.CDOReference">
<!-- -->
@@ -152,6 +173,46 @@ extends <a href="../../../../org/eclipse/emf/cdo/common/id/CDOReference.html" ti
</li>
</ul>
</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a name="getTargetID--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getTargetID</h4>
+<pre><a href="../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>&nbsp;getTargetID()</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>4.6</dd>
+</dl>
+</li>
+</ul>
+<a name="getSourceID--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getSourceID</h4>
+<pre><a href="../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>&nbsp;getSourceID()</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>4.6</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
</div>
<!-- ========= END OF CLASS DATA ========= -->
<!-- ======= START OF BOTTOM NAVBAR ====== -->
@@ -202,13 +263,13 @@ extends <a href="../../../../org/eclipse/emf/cdo/common/id/CDOReference.html" ti
<li>Nested&nbsp;|&nbsp;</li>
<li>Field&nbsp;|&nbsp;</li>
<li>Constr&nbsp;|&nbsp;</li>
-<li>Method</li>
+<li><a href="#method.summary">Method</a></li>
</ul>
<ul class="subNavList">
<li>Detail:&nbsp;</li>
<li>Field&nbsp;|&nbsp;</li>
<li>Constr&nbsp;|&nbsp;</li>
-<li>Method</li>
+<li><a href="#method.detail">Method</a></li>
</ul>
</div>
<a name="skip.navbar.bottom">
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/CDOState.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/CDOState.html
index 861fa4ece5..518880b8fe 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/CDOState.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/CDOState.html
@@ -18,8 +18,8 @@
catch(err) {
}
//-->
-var methods = {"i0":9,"i1":9};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":10,"i1":10,"i2":9,"i3":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
var tableTab = "tableTab";
@@ -182,18 +182,26 @@ extends <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum
</a>
<h3>Method Summary</h3>
<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
<tr>
<th class="colFirst" scope="col">Modifier and Type</th>
<th class="colLast" scope="col">Method and Description</th>
</tr>
<tr id="i0" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/eclipse/emf/cdo/CDOState.html#isLocal--">isLocal</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/eclipse/emf/cdo/CDOState.html#isRemote--">isRemote</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
<td class="colFirst"><code>static <a href="../../../../org/eclipse/emf/cdo/CDOState.html" title="enum in org.eclipse.emf.cdo">CDOState</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/eclipse/emf/cdo/CDOState.html#valueOf-java.lang.String-">valueOf</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
<div class="block">Returns the enum constant of this type with the specified name.</div>
</td>
</tr>
-<tr id="i1" class="rowColor">
+<tr id="i3" class="rowColor">
<td class="colFirst"><code>static <a href="../../../../org/eclipse/emf/cdo/CDOState.html" title="enum in org.eclipse.emf.cdo">CDOState</a>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/eclipse/emf/cdo/CDOState.html#values--">values</a></span>()</code>
<div class="block">Returns an array containing the constants of this enum type, in
@@ -236,6 +244,10 @@ the order they are declared.</div>
<li class="blockList">
<h4>TRANSIENT</h4>
<pre>public static final&nbsp;<a href="../../../../org/eclipse/emf/cdo/CDOState.html" title="enum in org.eclipse.emf.cdo">CDOState</a> TRANSIENT</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>1.0</dd>
+</dl>
</li>
</ul>
<a name="NEW">
@@ -245,6 +257,10 @@ the order they are declared.</div>
<li class="blockList">
<h4>NEW</h4>
<pre>public static final&nbsp;<a href="../../../../org/eclipse/emf/cdo/CDOState.html" title="enum in org.eclipse.emf.cdo">CDOState</a> NEW</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>1.0</dd>
+</dl>
</li>
</ul>
<a name="CLEAN">
@@ -254,6 +270,10 @@ the order they are declared.</div>
<li class="blockList">
<h4>CLEAN</h4>
<pre>public static final&nbsp;<a href="../../../../org/eclipse/emf/cdo/CDOState.html" title="enum in org.eclipse.emf.cdo">CDOState</a> CLEAN</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>1.0</dd>
+</dl>
</li>
</ul>
<a name="DIRTY">
@@ -263,6 +283,10 @@ the order they are declared.</div>
<li class="blockList">
<h4>DIRTY</h4>
<pre>public static final&nbsp;<a href="../../../../org/eclipse/emf/cdo/CDOState.html" title="enum in org.eclipse.emf.cdo">CDOState</a> DIRTY</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>1.0</dd>
+</dl>
</li>
</ul>
<a name="PROXY">
@@ -272,6 +296,10 @@ the order they are declared.</div>
<li class="blockList">
<h4>PROXY</h4>
<pre>public static final&nbsp;<a href="../../../../org/eclipse/emf/cdo/CDOState.html" title="enum in org.eclipse.emf.cdo">CDOState</a> PROXY</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>1.0</dd>
+</dl>
</li>
</ul>
<a name="CONFLICT">
@@ -281,6 +309,10 @@ the order they are declared.</div>
<li class="blockList">
<h4>CONFLICT</h4>
<pre>public static final&nbsp;<a href="../../../../org/eclipse/emf/cdo/CDOState.html" title="enum in org.eclipse.emf.cdo">CDOState</a> CONFLICT</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>1.0</dd>
+</dl>
</li>
</ul>
<a name="INVALID">
@@ -350,7 +382,7 @@ for (CDOState c : CDOState.values())
<a name="valueOf-java.lang.String-">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>valueOf</h4>
<pre>public static&nbsp;<a href="../../../../org/eclipse/emf/cdo/CDOState.html" title="enum in org.eclipse.emf.cdo">CDOState</a>&nbsp;valueOf(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
@@ -369,6 +401,32 @@ not permitted.)</div>
</dl>
</li>
</ul>
+<a name="isLocal--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isLocal</h4>
+<pre>public final&nbsp;boolean&nbsp;isLocal()</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>4.6</dd>
+</dl>
+</li>
+</ul>
+<a name="isRemote--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>isRemote</h4>
+<pre>public final&nbsp;boolean&nbsp;isRemote()</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>4.6</dd>
+</dl>
+</li>
+</ul>
</li>
</ul>
</li>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/admin/CDOAdminClientRepository.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/admin/CDOAdminClientRepository.html
index 9f3a538670..6eb00cbdc1 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/admin/CDOAdminClientRepository.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/admin/CDOAdminClientRepository.html
@@ -146,7 +146,7 @@ extends <a href="../../../../../org/eclipse/emf/cdo/common/admin/CDOAdminReposit
<!-- -->
</a>
<h3>Nested classes/interfaces inherited from interface&nbsp;org.eclipse.emf.cdo.common.<a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonRepository</a></h3>
-<code><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.IDGenerationLocation.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.IDGenerationLocation</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.State.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.State</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.StateChangedEvent.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonRepository.StateChangedEvent</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.Type.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.Type</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.TypeChangedEvent.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonRepository.TypeChangedEvent</a></code></li>
+<code><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.IDGenerationLocation.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.IDGenerationLocation</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.State.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.State</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.StateChangedEvent.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonRepository.StateChangedEvent</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.Type.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.Type</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.TypeChangedEvent.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonRepository.TypeChangedEvent</a></code></li>
</ul>
</li>
</ul>
@@ -187,7 +187,7 @@ extends <a href="../../../../../org/eclipse/emf/cdo/common/admin/CDOAdminReposit
<!-- -->
</a>
<h3>Methods inherited from interface&nbsp;org.eclipse.emf.cdo.common.<a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonRepository</a></h3>
-<code><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getCreationTime--">getCreationTime</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getIDGenerationLocation--">getIDGenerationLocation</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getName--">getName</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getObjectIDTypes--">getObjectIDTypes</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getRootResourceID--">getRootResourceID</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getState--">getState</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getStoreType--">getStoreType</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getType--">getType</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getUUID--">getUUID</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isAuthenticating--">isAuthenticating</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isEnsuringReferentialIntegrity--">isEnsuringReferentialIntegrity</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSerializingCommits--">isSerializingCommits</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSupportingAudits--">isSupportingAudits</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSupportingBranches--">isSupportingBranches</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSupportingEcore--">isSupportingEcore</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSupportingUnits--">isSupportingUnits</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#waitWhileInitial-org.eclipse.core.runtime.IProgressMonitor-">waitWhileInitial</a></code></li>
+<code><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getCommitInfoStorage--">getCommitInfoStorage</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getCreationTime--">getCreationTime</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getIDGenerationLocation--">getIDGenerationLocation</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getName--">getName</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getObjectIDTypes--">getObjectIDTypes</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getRootResourceID--">getRootResourceID</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getState--">getState</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getStoreType--">getStoreType</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getType--">getType</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getUUID--">getUUID</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isAuthenticating--">isAuthenticating</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isEnsuringReferentialIntegrity--">isEnsuringReferentialIntegrity</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSerializingCommits--">isSerializingCommits</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSupportingAudits--">isSupportingAudits</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSupportingBranches--">isSupportingBranches</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSupportingEcore--">isSupportingEcore</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSupportingUnits--">isSupportingUnits</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#waitWhileInitial-org.eclipse.core.runtime.IProgressMonitor-">waitWhileInitial</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.eclipse.core.runtime.IAdaptable">
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/class-use/CDOObject.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/class-use/CDOObject.html
index 7e098fcc7b..8157a5d96e 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/class-use/CDOObject.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/class-use/CDOObject.html
@@ -1158,7 +1158,9 @@
</tr>
<tr class="altColor">
<td class="colFirst"><code><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">CDOTransaction.</span><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#getConflicts--">getConflicts</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">CDOTransaction.</span><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#getConflicts--">getConflicts</a></span>()</code>
+<div class="block">Returns the set of objects that are conflicting with remote modifications or an empty set if <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#hasConflict--"><code>CDOTransaction.hasConflict()</code></a> returns <code>false</code>.</div>
+</td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>,<a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>&gt;</code></td>
@@ -1385,6 +1387,22 @@
<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
</td>
</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">CDODefaultTransactionHandler1.</span><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler1.html#undoingObject-org.eclipse.emf.cdo.transaction.CDOTransaction-org.eclipse.emf.cdo.CDOObject-org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta-">undoingObject</a></span>(<a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a>&nbsp;transaction,
+ <a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>&nbsp;object,
+ <a href="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</a>&nbsp;featureDelta)</code>
+<div class="block">This implementation does nothing.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">CDOTransactionHandler1.WithUndo.</span><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.WithUndo.html#undoingObject-org.eclipse.emf.cdo.transaction.CDOTransaction-org.eclipse.emf.cdo.CDOObject-org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta-">undoingObject</a></span>(<a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a>&nbsp;transaction,
+ <a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>&nbsp;object,
+ <a href="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</a>&nbsp;featureDelta)</code>
+<div class="block">Called by a <code>CDOTransaction</code> <b>before</b> an object is modified.</div>
+</td>
+</tr>
</tbody>
</table>
<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
@@ -1395,47 +1413,51 @@
</tr>
<tbody>
<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</a>[]</code></td>
+<td class="colLast"><span class="typeNameLabel">CDOPushTransaction.</span><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#getLockStatesOfObjects-java.util.Collection-">getLockStatesOfObjects</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;? extends <a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>&gt;&nbsp;objects)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">CDOPushTransaction.</span><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#lockObjects-java.util.Collection-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-long-">lockObjects</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;? extends <a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>&gt;&nbsp;objects,
<a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.html?is-external=true" title="class or interface in org.eclipse.net4j.util.concurrent">IRWLockManager.LockType</a>&nbsp;lockType,
long&nbsp;timeout)</code>&nbsp;</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">CDOPushTransaction.</span><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#lockObjects-java.util.Collection-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-long-boolean-">lockObjects</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;? extends <a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>&gt;&nbsp;objects,
<a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.html?is-external=true" title="class or interface in org.eclipse.net4j.util.concurrent">IRWLockManager.LockType</a>&nbsp;lockType,
long&nbsp;timeout,
boolean&nbsp;recursive)</code>&nbsp;</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/CDOObjectReference.html" title="interface in org.eclipse.emf.cdo">CDOObjectReference</a>&gt;</code></td>
<td class="colLast"><span class="typeNameLabel">CDOPushTransaction.</span><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#queryXRefs-java.util.Set-org.eclipse.emf.ecore.EReference...-">queryXRefs</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>&gt;&nbsp;targetObjects,
<a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EReference.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EReference</a>...&nbsp;sourceReferences)</code>&nbsp;</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/CloseableIterator.html?is-external=true" title="class or interface in org.eclipse.net4j.util.collection">CloseableIterator</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/CDOObjectReference.html" title="interface in org.eclipse.emf.cdo">CDOObjectReference</a>&gt;</code></td>
<td class="colLast"><span class="typeNameLabel">CDOPushTransaction.</span><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#queryXRefsAsync-java.util.Set-org.eclipse.emf.ecore.EReference...-">queryXRefsAsync</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>&gt;&nbsp;targetObjects,
<a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EReference.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EReference</a>...&nbsp;sourceReferences)</code>&nbsp;</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">CDOConflictResolver2.</span><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOConflictResolver2.html#resolveConflicts-java.util.Map-java.util.List-">resolveConflicts</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>,<a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Pair.html?is-external=true" title="class or interface in org.eclipse.net4j.util.collection">Pair</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevision</a>,<a href="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDORevisionDelta</a>&gt;&gt;&nbsp;conflicts,
<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDORevisionDelta</a>&gt;&nbsp;allRemoteDeltas)</code>
<div class="block">Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">CDOConflictResolver.</span><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOConflictResolver.html#resolveConflicts-java.util.Set-">resolveConflicts</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>&gt;&nbsp;conflicts)</code>
<div class="block">Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">CDOPushTransaction.</span><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#unlockObjects-java.util.Collection-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-">unlockObjects</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;? extends <a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>&gt;&nbsp;objects,
<a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.html?is-external=true" title="class or interface in org.eclipse.net4j.util.concurrent">IRWLockManager.LockType</a>&nbsp;lockType)</code>&nbsp;</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">CDOPushTransaction.</span><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#unlockObjects-java.util.Collection-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-boolean-">unlockObjects</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;? extends <a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>&gt;&nbsp;objects,
<a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.html?is-external=true" title="class or interface in org.eclipse.net4j.util.concurrent">IRWLockManager.LockType</a>&nbsp;lockType,
@@ -1737,6 +1759,12 @@
</tr>
<tbody>
<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</a>[]</code></td>
+<td class="colLast"><span class="typeNameLabel">CDOView.</span><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getLockStatesOfObjects-java.util.Collection-">getLockStatesOfObjects</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;? extends <a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>&gt;&nbsp;objects)</code>
+<div class="block">Get an array of <a href="../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock"><code>lock states</code></a> corresponding to the specified collection of <a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><code>objects</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">CDOView.</span><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#lockObjects-java.util.Collection-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-long-">lockObjects</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;? extends <a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>&gt;&nbsp;objects,
<a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.html?is-external=true" title="class or interface in org.eclipse.net4j.util.concurrent">IRWLockManager.LockType</a>&nbsp;lockType,
@@ -1744,14 +1772,14 @@
<div class="block">Locks the given objects.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">CDOView.</span><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#lockObjects-java.util.Collection-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-long-boolean-">lockObjects</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;? extends <a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>&gt;&nbsp;objects,
<a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.html?is-external=true" title="class or interface in org.eclipse.net4j.util.concurrent">IRWLockManager.LockType</a>&nbsp;lockType,
long&nbsp;timeout,
boolean&nbsp;recursive)</code>&nbsp;</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/CDOObjectReference.html" title="interface in org.eclipse.emf.cdo">CDOObjectReference</a>&gt;</code></td>
<td class="colLast"><span class="typeNameLabel">CDOView.</span><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryXRefs-java.util.Set-org.eclipse.emf.ecore.EReference...-">queryXRefs</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>&gt;&nbsp;targetObjects,
<a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EReference.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EReference</a>...&nbsp;sourceReferences)</code>
@@ -1759,7 +1787,7 @@
target objects.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/CloseableIterator.html?is-external=true" title="class or interface in org.eclipse.net4j.util.collection">CloseableIterator</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/CDOObjectReference.html" title="interface in org.eclipse.emf.cdo">CDOObjectReference</a>&gt;</code></td>
<td class="colLast"><span class="typeNameLabel">CDOView.</span><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryXRefsAsync-java.util.Set-org.eclipse.emf.ecore.EReference...-">queryXRefsAsync</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>&gt;&nbsp;targetObjects,
<a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EReference.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EReference</a>...&nbsp;sourceReferences)</code>
@@ -1767,14 +1795,14 @@
the specified target objects.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">CDOView.</span><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#unlockObjects-java.util.Collection-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-">unlockObjects</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;? extends <a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>&gt;&nbsp;objects,
<a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.html?is-external=true" title="class or interface in org.eclipse.net4j.util.concurrent">IRWLockManager.LockType</a>&nbsp;lockType)</code>
<div class="block">Unlocks the given locked objects of this view.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">CDOView.</span><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#unlockObjects-java.util.Collection-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-boolean-">unlockObjects</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;? extends <a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>&gt;&nbsp;objects,
<a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.html?is-external=true" title="class or interface in org.eclipse.net4j.util.concurrent">IRWLockManager.LockType</a>&nbsp;lockType,
@@ -1829,6 +1857,23 @@
</tbody>
</table>
<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</a> that return <a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a></code></td>
+<td class="colLast"><span class="typeNameLabel">InternalCDOSavepoint.</span><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSavepoint.html#getDetachedObject-org.eclipse.emf.cdo.common.id.CDOID-">getDetachedObject</a></span>(<a href="../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>&nbsp;id)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a></code></td>
+<td class="colLast"><span class="typeNameLabel">InternalCDOSavepoint.</span><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSavepoint.html#getDirtyObject-org.eclipse.emf.cdo.common.id.CDOID-">getDirtyObject</a></span>(<a href="../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>&nbsp;id)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
<caption><span>Methods in <a href="../../../../../org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</a> that return types with arguments of type <a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a></span><span class="tabEnd">&nbsp;</span></caption>
<tr>
<th class="colFirst" scope="col">Modifier and Type</th>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html
new file mode 100644
index 0000000000..27597fac5e
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html
@@ -0,0 +1,364 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+
+<title>CDOCommonRepository.CommitInfoStorage (CDO Model Repository Documentation)</title>
+<meta name="date" content="">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="CDOCommonRepository.CommitInfoStorage (CDO Model Repository Documentation)";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var methods = {"i0":9,"i1":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/CDOCommonRepository.CommitInfoStorage.html">Use</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.IDGenerationLocation.html" title="enum in org.eclipse.emf.cdo.common"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" target="_top">Frames</a></li>
+<li><a href="CDOCommonRepository.CommitInfoStorage.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.eclipse.emf.cdo.common</div>
+<h2 title="Enum CDOCommonRepository.CommitInfoStorage" class="title">Enum CDOCommonRepository.CommitInfoStorage</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">java.lang.Enum</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a>&gt;</li>
+<li>
+<ul class="inheritance">
+<li>org.eclipse.emf.cdo.common.CDOCommonRepository.CommitInfoStorage</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a>&gt;</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonRepository</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public static enum <span class="typeNameLabel">CDOCommonRepository.CommitInfoStorage</span>
+extends <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a>&gt;</pre>
+<div class="block">Enumerates the possible <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getIDGenerationLocation--"><code>ID generation locations</code></a> of a CDO
+ repository.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>4.6</dd>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Eike Stepper</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== ENUM CONSTANT SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="enum.constant.summary">
+<!-- -->
+</a>
+<h3>Enum Constant Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Constant Summary table, listing enum constants, and an explanation">
+<caption><span>Enum Constants</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Enum Constant and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html#NO">NO</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html#WITH_MERGE_SOURCE">WITH_MERGE_SOURCE</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html#YES">YES</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html#valueOf-java.lang.String-">valueOf</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a>[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html#values--">values</a></span>()</code>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Enum">
+<!-- -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</a></h3>
+<code><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true#compareTo-E-" title="class or interface in java.lang">compareTo</a>, <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true#getDeclaringClass--" title="class or interface in java.lang">getDeclaringClass</a>, <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true#name--" title="class or interface in java.lang">name</a>, <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true#ordinal--" title="class or interface in java.lang">ordinal</a>, <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true#toString--" title="class or interface in java.lang">toString</a>, <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true#valueOf-java.lang.Class-java.lang.String-" title="class or interface in java.lang">valueOf</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ ENUM CONSTANT DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="enum.constant.detail">
+<!-- -->
+</a>
+<h3>Enum Constant Detail</h3>
+<a name="NO">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NO</h4>
+<pre>public static final&nbsp;<a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a> NO</pre>
+</li>
+</ul>
+<a name="YES">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>YES</h4>
+<pre>public static final&nbsp;<a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a> YES</pre>
+</li>
+</ul>
+<a name="WITH_MERGE_SOURCE">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>WITH_MERGE_SOURCE</h4>
+<pre>public static final&nbsp;<a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a> WITH_MERGE_SOURCE</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a name="values--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>values</h4>
+<pre>public static&nbsp;<a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a>[]&nbsp;values()</pre>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared. This method may be used to iterate
+over the constants as follows:
+<pre>
+for (CDOCommonRepository.CommitInfoStorage c : CDOCommonRepository.CommitInfoStorage.values())
+&nbsp; System.out.println(c);
+</pre></div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>an array containing the constants of this enum type, in the order they are declared</dd>
+</dl>
+</li>
+</ul>
+<a name="valueOf-java.lang.String-">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>valueOf</h4>
+<pre>public static&nbsp;<a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a>&nbsp;valueOf(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<div class="block">Returns the enum constant of this type with the specified name.
+The string must match <i>exactly</i> an identifier used to declare an
+enum constant in this type. (Extraneous whitespace characters are
+not permitted.)</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>name</code> - the name of the enum constant to be returned.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the enum constant with the specified name</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/IllegalArgumentException.html?is-external=true" title="class or interface in java.lang">IllegalArgumentException</a></code> - if this enum type has no constant with the specified name</dd>
+<dd><code><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/NullPointerException.html?is-external=true" title="class or interface in java.lang">NullPointerException</a></code> - if the argument is null</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/CDOCommonRepository.CommitInfoStorage.html">Use</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.IDGenerationLocation.html" title="enum in org.eclipse.emf.cdo.common"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" target="_top">Frames</a></li>
+<li><a href="CDOCommonRepository.CommitInfoStorage.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small><i class="copyright">Copyright (c) 2014 Eike Stepper (Berlin, Germany) and others.<br>All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html</i></small></p>
+</body>
+</html>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonRepository.IDGenerationLocation.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonRepository.IDGenerationLocation.html
index b24dbe7c4c..081fe67970 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonRepository.IDGenerationLocation.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonRepository.IDGenerationLocation.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
<li><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.State.html" title="enum in org.eclipse.emf.cdo.common"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
</ul>
<ul class="navList">
@@ -306,7 +306,7 @@ not permitted.)</div>
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
<li><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.State.html" title="enum in org.eclipse.emf.cdo.common"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
</ul>
<ul class="navList">
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonRepository.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonRepository.html
index 5527f2821c..8be8cc7cd4 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonRepository.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonRepository.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":38,"i15":6,"i16":6};
+var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6,"i15":38,"i16":6,"i17":6};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],32:["t6","Deprecated Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
<div class="subNav">
<ul class="navList">
<li>Prev&nbsp;Class</li>
-<li><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.IDGenerationLocation.html" title="enum in org.eclipse.emf.cdo.common"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../index.html?org/eclipse/emf/cdo/common/CDOCommonRepository.html" target="_top">Frames</a></li>
@@ -156,30 +156,37 @@ extends <a href="../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.
</tr>
<tr class="altColor">
<td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.IDGenerationLocation.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.IDGenerationLocation</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a></span></code>
<div class="block">Enumerates the possible <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getIDGenerationLocation--"><code>ID generation locations</code></a> of a CDO
repository.</div>
</td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.IDGenerationLocation.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.IDGenerationLocation</a></span></code>
+<div class="block">Enumerates the possible <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getIDGenerationLocation--"><code>ID generation locations</code></a> of a CDO
+ repository.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.State.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.State</a></span></code>
<div class="block">Enumerates the possible <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getState--"><code>states</code></a> of a CDO repository.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>static interface&nbsp;</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.StateChangedEvent.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonRepository.StateChangedEvent</a></span></code>
<div class="block">An <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.event"><code>event</code></a> fired when the <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.State.html" title="enum in org.eclipse.emf.cdo.common"><code>state</code></a> of a CDO repository has changed.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>static class&nbsp;</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.Type.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.Type</a></span></code>
<div class="block">Enumerates the possible <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getType--"><code>types</code></a> of a CDO repository.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>static interface&nbsp;</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.TypeChangedEvent.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonRepository.TypeChangedEvent</a></span></code>
<div class="block">An <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.event"><code>event</code></a> fired when the <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.Type.html" title="enum in org.eclipse.emf.cdo.common"><code>type</code></a> of a CDO repository has changed.</div>
@@ -201,88 +208,92 @@ extends <a href="../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.
<th class="colLast" scope="col">Method and Description</th>
</tr>
<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getCommitInfoStorage--">getCommitInfoStorage</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
<td class="colFirst"><code>long</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getCreationTime--">getCreationTime</a></span>()</code>
<div class="block">Returns the creation time of this repository.</div>
</td>
</tr>
-<tr id="i1" class="rowColor">
+<tr id="i2" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.IDGenerationLocation.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.IDGenerationLocation</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getIDGenerationLocation--">getIDGenerationLocation</a></span>()</code>&nbsp;</td>
</tr>
-<tr id="i2" class="altColor">
+<tr id="i3" class="rowColor">
<td class="colFirst"><code><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getName--">getName</a></span>()</code>
<div class="block">Returns the name of this repository.</div>
</td>
</tr>
-<tr id="i3" class="rowColor">
+<tr id="i4" class="altColor">
<td class="colFirst"><code><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/common/id/CDOID.ObjectType.html" title="enum in org.eclipse.emf.cdo.common.id">CDOID.ObjectType</a>&gt;</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getObjectIDTypes--">getObjectIDTypes</a></span>()</code>
<div class="block">Returns the type of CDOIDs created by the store of this repository.</div>
</td>
</tr>
-<tr id="i4" class="altColor">
+<tr id="i5" class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getRootResourceID--">getRootResourceID</a></span>()</code>
<div class="block">Returns the ID of the root resource of this repository.</div>
</td>
</tr>
-<tr id="i5" class="rowColor">
+<tr id="i6" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.State.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.State</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getState--">getState</a></span>()</code>
<div class="block">Returns the state of this repository.</div>
</td>
</tr>
-<tr id="i6" class="altColor">
+<tr id="i7" class="rowColor">
<td class="colFirst"><code><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getStoreType--">getStoreType</a></span>()</code>
<div class="block">Returns the type of the store of this repository.</div>
</td>
</tr>
-<tr id="i7" class="rowColor">
+<tr id="i8" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.Type.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.Type</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getType--">getType</a></span>()</code>
<div class="block">Returns the type of this repository.</div>
</td>
</tr>
-<tr id="i8" class="altColor">
+<tr id="i9" class="rowColor">
<td class="colFirst"><code><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getUUID--">getUUID</a></span>()</code>
<div class="block">Returns the UUID of this repository.</div>
</td>
</tr>
-<tr id="i9" class="rowColor">
+<tr id="i10" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isAuthenticating--">isAuthenticating</a></span>()</code>
<div class="block">Returns <code>true</code> if this repository requires user authentication, <code>false</code> otherwise.</div>
</td>
</tr>
-<tr id="i10" class="altColor">
+<tr id="i11" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isEnsuringReferentialIntegrity--">isEnsuringReferentialIntegrity</a></span>()</code>
<div class="block">Returns <code>true</code> if this repository ensures referential integrity, <code>false</code> otherwise.</div>
</td>
</tr>
-<tr id="i11" class="rowColor">
+<tr id="i12" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSerializingCommits--">isSerializingCommits</a></span>()</code>
<div class="block">Returns <code>true</code> if this repository serializes commits, <code>false</code> otherwise.</div>
</td>
</tr>
-<tr id="i12" class="altColor">
+<tr id="i13" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSupportingAudits--">isSupportingAudits</a></span>()</code>
<div class="block">Returns <code>true</code> if this repository supports auditing, <code>false</code> otherwise.</div>
</td>
</tr>
-<tr id="i13" class="rowColor">
+<tr id="i14" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSupportingBranches--">isSupportingBranches</a></span>()</code>
<div class="block">Returns <code>true</code> if this repository supports branching, <code>false</code> otherwise.</div>
</td>
</tr>
-<tr id="i14" class="altColor">
+<tr id="i15" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSupportingEcore--">isSupportingEcore</a></span>()</code>
<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -290,13 +301,13 @@ extends <a href="../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.
</div>
</td>
</tr>
-<tr id="i15" class="rowColor">
+<tr id="i16" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSupportingUnits--">isSupportingUnits</a></span>()</code>
<div class="block">Returns <code>true</code> if this repository supports units, <code>false</code> otherwise.</div>
</td>
</tr>
-<tr id="i16" class="altColor">
+<tr id="i17" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#waitWhileInitial-org.eclipse.core.runtime.IProgressMonitor-">waitWhileInitial</a></span>(<a href="http://help.eclipse.org/topic//org.eclipse.platform.doc.isv/reference/api/org/eclipse/core/runtime/IProgressMonitor.html?is-external=true" title="class or interface in org.eclipse.core.runtime">IProgressMonitor</a>&nbsp;monitor)</code>&nbsp;</td>
</tr>
@@ -412,6 +423,19 @@ extends <a href="../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.
</dl>
</li>
</ul>
+<a name="getCommitInfoStorage--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getCommitInfoStorage</h4>
+<pre><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a>&nbsp;getCommitInfoStorage()</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>4.6</dd>
+</dl>
+</li>
+</ul>
<a name="getRootResourceID--">
<!-- -->
</a>
@@ -555,7 +579,7 @@ boolean&nbsp;isSupportingEcore()</pre>
<div class="subNav">
<ul class="navList">
<li>Prev&nbsp;Class</li>
-<li><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.IDGenerationLocation.html" title="enum in org.eclipse.emf.cdo.common"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../index.html?org/eclipse/emf/cdo/common/CDOCommonRepository.html" target="_top">Frames</a></li>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonTransaction.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonTransaction.html
index c991068953..7915e5561d 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonTransaction.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonTransaction.html
@@ -94,7 +94,7 @@
<li class="blockList">
<dl>
<dt>All Superinterfaces:</dt>
-<dd><a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonView</a>, <a href="../../../../../org/eclipse/emf/cdo/common/lock/CDOLockOwner.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockOwner</a>, <a href="../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionProvider.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionProvider</a>, <a href="../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOTimeProvider</a>, <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Closeable.html?is-external=true" title="class or interface in org.eclipse.net4j.util.collection">Closeable</a>, <a href="http://help.eclipse.org/topic//org.eclipse.platform.doc.isv/reference/api/org/eclipse/core/runtime/IAdaptable.html?is-external=true" title="class or interface in org.eclipse.core.runtime">IAdaptable</a>, <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/options/IOptionsContainer.html?is-external=true" title="class or interface in org.eclipse.net4j.util.options">IOptionsContainer</a>, <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/properties/IPropertiesContainer.html?is-external=true" title="class or interface in org.eclipse.net4j.util.properties">IPropertiesContainer</a></dd>
+<dd><a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>, <a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonView</a>, <a href="../../../../../org/eclipse/emf/cdo/common/lock/CDOLockOwner.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockOwner</a>, <a href="../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionProvider.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionProvider</a>, <a href="../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOTimeProvider</a>, <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Closeable.html?is-external=true" title="class or interface in org.eclipse.net4j.util.collection">Closeable</a>, <a href="http://help.eclipse.org/topic//org.eclipse.platform.doc.isv/reference/api/org/eclipse/core/runtime/IAdaptable.html?is-external=true" title="class or interface in org.eclipse.core.runtime">IAdaptable</a>, <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/options/IOptionsContainer.html?is-external=true" title="class or interface in org.eclipse.net4j.util.options">IOptionsContainer</a>, <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/properties/IPropertiesContainer.html?is-external=true" title="class or interface in org.eclipse.net4j.util.properties">IPropertiesContainer</a></dd>
</dl>
<dl>
<dt>All Known Subinterfaces:</dt>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonView.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonView.html
index 1cd90b6353..f78b5de65b 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonView.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonView.html
@@ -100,7 +100,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<dl>
<dt>All Superinterfaces:</dt>
-<dd><a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>, <a href="../../../../../org/eclipse/emf/cdo/common/lock/CDOLockOwner.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockOwner</a>, <a href="../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionProvider.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionProvider</a>, <a href="../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOTimeProvider</a>, <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Closeable.html?is-external=true" title="class or interface in org.eclipse.net4j.util.collection">Closeable</a>, <a href="http://help.eclipse.org/topic//org.eclipse.platform.doc.isv/reference/api/org/eclipse/core/runtime/IAdaptable.html?is-external=true" title="class or interface in org.eclipse.core.runtime">IAdaptable</a>, <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/options/IOptionsContainer.html?is-external=true" title="class or interface in org.eclipse.net4j.util.options">IOptionsContainer</a>, <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/properties/IPropertiesContainer.html?is-external=true" title="class or interface in org.eclipse.net4j.util.properties">IPropertiesContainer</a></dd>
+<dd><a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>, <a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a>, <a href="../../../../../org/eclipse/emf/cdo/common/lock/CDOLockOwner.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockOwner</a>, <a href="../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionProvider.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionProvider</a>, <a href="../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOTimeProvider</a>, <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Closeable.html?is-external=true" title="class or interface in org.eclipse.net4j.util.collection">Closeable</a>, <a href="http://help.eclipse.org/topic//org.eclipse.platform.doc.isv/reference/api/org/eclipse/core/runtime/IAdaptable.html?is-external=true" title="class or interface in org.eclipse.core.runtime">IAdaptable</a>, <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/options/IOptionsContainer.html?is-external=true" title="class or interface in org.eclipse.net4j.util.options">IOptionsContainer</a>, <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/properties/IPropertiesContainer.html?is-external=true" title="class or interface in org.eclipse.net4j.util.properties">IPropertiesContainer</a></dd>
</dl>
<dl>
<dt>All Known Subinterfaces:</dt>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/admin/CDOAdminRepository.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/admin/CDOAdminRepository.html
index d163a9c270..f918ca49ca 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/admin/CDOAdminRepository.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/admin/CDOAdminRepository.html
@@ -138,7 +138,7 @@ extends <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepositor
<!-- -->
</a>
<h3>Nested classes/interfaces inherited from interface&nbsp;org.eclipse.emf.cdo.common.<a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonRepository</a></h3>
-<code><a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.IDGenerationLocation.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.IDGenerationLocation</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.State.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.State</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.StateChangedEvent.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonRepository.StateChangedEvent</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.Type.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.Type</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.TypeChangedEvent.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonRepository.TypeChangedEvent</a></code></li>
+<code><a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.IDGenerationLocation.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.IDGenerationLocation</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.State.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.State</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.StateChangedEvent.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonRepository.StateChangedEvent</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.Type.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.Type</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.TypeChangedEvent.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonRepository.TypeChangedEvent</a></code></li>
</ul>
</li>
</ul>
@@ -176,7 +176,7 @@ extends <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepositor
<!-- -->
</a>
<h3>Methods inherited from interface&nbsp;org.eclipse.emf.cdo.common.<a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonRepository</a></h3>
-<code><a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getCreationTime--">getCreationTime</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getIDGenerationLocation--">getIDGenerationLocation</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getName--">getName</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getObjectIDTypes--">getObjectIDTypes</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getRootResourceID--">getRootResourceID</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getState--">getState</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getStoreType--">getStoreType</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getType--">getType</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getUUID--">getUUID</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isAuthenticating--">isAuthenticating</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isEnsuringReferentialIntegrity--">isEnsuringReferentialIntegrity</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSerializingCommits--">isSerializingCommits</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSupportingAudits--">isSupportingAudits</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSupportingBranches--">isSupportingBranches</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSupportingEcore--">isSupportingEcore</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSupportingUnits--">isSupportingUnits</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#waitWhileInitial-org.eclipse.core.runtime.IProgressMonitor-">waitWhileInitial</a></code></li>
+<code><a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getCommitInfoStorage--">getCommitInfoStorage</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getCreationTime--">getCreationTime</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getIDGenerationLocation--">getIDGenerationLocation</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getName--">getName</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getObjectIDTypes--">getObjectIDTypes</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getRootResourceID--">getRootResourceID</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getState--">getState</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getStoreType--">getStoreType</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getType--">getType</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getUUID--">getUUID</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isAuthenticating--">isAuthenticating</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isEnsuringReferentialIntegrity--">isEnsuringReferentialIntegrity</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSerializingCommits--">isSerializingCommits</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSupportingAudits--">isSupportingAudits</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSupportingBranches--">isSupportingBranches</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSupportingEcore--">isSupportingEcore</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#isSupportingUnits--">isSupportingUnits</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#waitWhileInitial-org.eclipse.core.runtime.IProgressMonitor-">waitWhileInitial</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.eclipse.core.runtime.IAdaptable">
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranch.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranch.html
index dd6c6e0bb4..8f15fe3256 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranch.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranch.html
@@ -100,7 +100,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<dl>
<dt>All Superinterfaces:</dt>
-<dd><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/util/CDONameProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDONameProvider</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOTimeProvider</a>, <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&gt;, <a href="http://help.eclipse.org/topic//org.eclipse.platform.doc.isv/reference/api/org/eclipse/core/runtime/IAdaptable.html?is-external=true" title="class or interface in org.eclipse.core.runtime">IAdaptable</a>, <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.html?is-external=true" title="class or interface in org.eclipse.net4j.util.container">IContainer</a>&lt;<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&gt;, <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/INotifier.html?is-external=true" title="class or interface in org.eclipse.net4j.util.event">INotifier</a></dd>
+<dd><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/util/CDONameProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDONameProvider</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOTimeProvider</a>, <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&gt;, <a href="http://help.eclipse.org/topic//org.eclipse.platform.doc.isv/reference/api/org/eclipse/core/runtime/IAdaptable.html?is-external=true" title="class or interface in org.eclipse.core.runtime">IAdaptable</a>, <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.html?is-external=true" title="class or interface in org.eclipse.net4j.util.container">IContainer</a>&lt;<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&gt;, <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/INotifier.html?is-external=true" title="class or interface in org.eclipse.net4j.util.event">INotifier</a></dd>
</dl>
<dl>
<dt>All Known Subinterfaces:</dt>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchChangedEvent.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchChangedEvent.html
index ab5cd76f3a..92334b8e8a 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchChangedEvent.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchChangedEvent.html
@@ -100,7 +100,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<dl>
<dt>All Superinterfaces:</dt>
-<dd><a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.event">IEvent</a></dd>
+<dd><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a>, <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.event">IEvent</a></dd>
</dl>
<dl>
<dt>All Known Subinterfaces:</dt>
@@ -109,7 +109,7 @@ var activeTableTab = "activeTableTab";
<hr>
<br>
<pre>public interface <span class="typeNameLabel">CDOBranchChangedEvent</span>
-extends <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.event">IEvent</a></pre>
+extends <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.event">IEvent</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a></pre>
<div class="block">An <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.event"><code>event</code></a> fired from a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchManager.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch manager</code></a> when a new <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a> has
been created.</div>
<dl>
@@ -206,6 +206,10 @@ extends <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/
<li class="blockList">
<h4>getBranch</h4>
<pre><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;getBranch()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html#getBranch--">getBranch</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a></code></dd>
+</dl>
</li>
</ul>
<a name="getChangeKind--">
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchCreatedEvent.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchCreatedEvent.html
index 0c916011c3..8712bc2c9c 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchCreatedEvent.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchCreatedEvent.html
@@ -100,7 +100,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<dl>
<dt>All Superinterfaces:</dt>
-<dd><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchChangedEvent.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchChangedEvent</a>, <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.event">IEvent</a></dd>
+<dd><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchChangedEvent.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchChangedEvent</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a>, <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.event">IEvent</a></dd>
</dl>
<hr>
<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -216,6 +216,8 @@ extends <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchCh
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
<dd><code><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchChangedEvent.html#getBranch--">getBranch</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchChangedEvent.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchChangedEvent</a></code></dd>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html#getBranch--">getBranch</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a></code></dd>
</dl>
</li>
</ul>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html
index be011d062c..179d8c15f5 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html
@@ -100,7 +100,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<dl>
<dt>All Superinterfaces:</dt>
-<dd><a href="../../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOTimeProvider</a></dd>
+<dd><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOTimeProvider</a></dd>
</dl>
<dl>
<dt>All Known Subinterfaces:</dt>
@@ -113,7 +113,7 @@ var activeTableTab = "activeTableTab";
<hr>
<br>
<pre>public interface <span class="typeNameLabel">CDOBranchPoint</span>
-extends <a href="../../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOTimeProvider</a></pre>
+extends <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOTimeProvider</a></pre>
<div class="block">A <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getTimeStamp--"><code>point in time</code></a> in a particular <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getBranch--"><code>branch</code></a>.</div>
<dl>
<dt><span class="simpleTagLabel">Since:</span></dt>
@@ -256,6 +256,10 @@ extends <a href="../../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvid
<pre><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;getBranch()</pre>
<div class="block">Returns the branch of this branch point, or <code>null</code> if this branch point is the
<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getBase--"><code>base</code></a> of the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchManager.html#getMainBranch--"><code>main branch</code></a>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html#getBranch--">getBranch</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a></code></dd>
+</dl>
</li>
</ul>
<a name="getTimeStamp--">
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html
index 9b13d71cce..f86a4051d9 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
<div class="subNav">
<ul class="navList">
<li><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchTag.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../../index.html?org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html" target="_top">Frames</a></li>
@@ -106,7 +106,7 @@ var activeTableTab = "activeTableTab";
<br>
<pre>public interface <span class="typeNameLabel">CDOBranchPointRange</span></pre>
<div class="block">A range between the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getBase--"><code>base</code></a> of the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchManager.html#getMainBranch--"><code>main branch</code></a> and
- the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getHead--"><code>head</code></a> of any branch that is demarkated by a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getStartPoint--"><code>start point</code></a> and
+ the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getHead--"><code>head</code></a> of any branch that is demarcated by a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getStartPoint--"><code>start point</code></a> and
an <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getEndPoint--"><code>end point</code></a>.
<p>
The start point and the end point of a branch point range may have different branches or not.
@@ -217,7 +217,7 @@ var activeTableTab = "activeTableTab";
<div class="subNav">
<ul class="navList">
<li><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchTag.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../../index.html?org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html" target="_top">Frames</a></li>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html
new file mode 100644
index 0000000000..8b9bb8170e
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html
@@ -0,0 +1,235 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+
+<title>CDOBranchProvider (CDO Model Repository Documentation)</title>
+<meta name="date" content="">
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="CDOBranchProvider (CDO Model Repository Documentation)";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var methods = {"i0":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/CDOBranchProvider.html">Use</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchTag.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" target="_top">Frames</a></li>
+<li><a href="CDOBranchProvider.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.eclipse.emf.cdo.common.branch</div>
+<h2 title="Interface CDOBranchProvider" class="title">Interface CDOBranchProvider</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Known Subinterfaces:</dt>
+<dd><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchChangedEvent.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchChangedEvent</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchCreatedEvent.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchCreatedEvent</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchTag.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchTag</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchVersion</a>, <a href="../../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html" title="interface in org.eclipse.emf.cdo.transaction">CDOCommitContext</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitHistory.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitHistory</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitHistory.TriggerLoadElement.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitHistory.TriggerLoadElement</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonTransaction.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonTransaction</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonView</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/revision/CDOIDAndBranch.html" title="interface in org.eclipse.emf.cdo.common.revision">CDOIDAndBranch</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockChangeInfo.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockChangeInfo</a>, <a href="../../../../../../org/eclipse/emf/cdo/CDOObjectHistory.html" title="interface in org.eclipse.emf.cdo">CDOObjectHistory</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisable.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisable</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevision</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionCache.EvictionEvent.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionCache.EvictionEvent</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDORevisionDelta</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionKey.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionKey</a>, <a href="../../../../../../org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.html" title="interface in org.eclipse.emf.cdo.session">CDOSessionInvalidationEvent</a>, <a href="../../../../../../org/eclipse/emf/cdo/session/CDOSessionLocksChangedEvent.html" title="interface in org.eclipse.emf.cdo.session">CDOSessionLocksChangedEvent</a>, <a href="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a>, <a href="../../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view">CDOView</a>, <a href="../../../../../../org/eclipse/emf/cdo/view/CDOViewLocksChangedEvent.html" title="interface in org.eclipse.emf.cdo.view">CDOViewLocksChangedEvent</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockArea.html" title="interface in org.eclipse.emf.cdo.common.lock">IDurableLockingManager.LockArea</a>, <a href="../../../../../../org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranch.html" title="interface in org.eclipse.emf.cdo.spi.common.branch">InternalCDOBranch</a>, <a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</a>, <a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionDelta.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevisionDelta</a>, <a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSessionInvalidationEvent.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOSessionInvalidationEvent</a>, <a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOTransaction</a>, <a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.InternalCDOCommitContext.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOTransaction.InternalCDOCommitContext</a>, <a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOView</a>, <a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOXATransaction.InternalCDOXACommitContext.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOXATransaction.InternalCDOXACommitContext</a>, <a href="../../../../../../org/eclipse/emf/cdo/spi/server/InternalTransaction.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalTransaction</a>, <a href="../../../../../../org/eclipse/emf/cdo/spi/server/InternalView.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalView</a>, <a href="../../../../../../org/eclipse/emf/cdo/server/IQueryContext.html" title="interface in org.eclipse.emf.cdo.server">IQueryContext</a>, <a href="../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.QueryResourcesContext.html" title="interface in org.eclipse.emf.cdo.server">IStoreAccessor.QueryResourcesContext</a>, <a href="../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.QueryResourcesContext.ExactMatch.html" title="interface in org.eclipse.emf.cdo.server">IStoreAccessor.QueryResourcesContext.ExactMatch</a>, <a href="../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.QueryXRefsContext.html" title="interface in org.eclipse.emf.cdo.server">IStoreAccessor.QueryXRefsContext</a>, <a href="../../../../../../org/eclipse/emf/cdo/server/ITransaction.html" title="interface in org.eclipse.emf.cdo.server">ITransaction</a>, <a href="../../../../../../org/eclipse/emf/cdo/server/IView.html" title="interface in org.eclipse.emf.cdo.server">IView</a></dd>
+</dl>
+<dl>
+<dt>All Known Implementing Classes:</dt>
+<dd><a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/AbstractCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">AbstractCDORevision</a>, <a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">BaseCDORevision</a>, <a href="../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDOChangeSetSegment</a>, <a href="../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</a>, <a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.CommitTransactionResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.CommitTransactionResult</a>, <a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">DelegatingCDORevision</a>, <a href="../../../../../../org/eclipse/emf/cdo/spi/server/DelegatingQueryResourcesContext.html" title="class in org.eclipse.emf.cdo.spi.server">DelegatingQueryResourcesContext</a>, <a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/DetachedCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">DetachedCDORevision</a>, <a href="../../../../../../org/eclipse/emf/cdo/spi/server/DurableLockArea.html" title="class in org.eclipse.emf.cdo.spi.server">DurableLockArea</a>, <a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/PointerCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">PointerCDORevision</a>, <a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/StubCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">StubCDORevision</a>, <a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/SyntheticCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">SyntheticCDORevision</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">CDOBranchProvider</span></pre>
+<div class="block">Provides the consumer with a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>4.6</dd>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Eike Stepper</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html#getBranch--">getBranch</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a name="getBranch--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getBranch</h4>
+<pre><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;getBranch()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/CDOBranchProvider.html">Use</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchTag.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" target="_top">Frames</a></li>
+<li><a href="CDOBranchProvider.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small><i class="copyright">Copyright (c) 2014 Eike Stepper (Berlin, Germany) and others.<br>All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html</i></small></p>
+</body>
+</html>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchTag.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchTag.html
index 46d1f3448d..a4b59baf5a 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchTag.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchTag.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
<li><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
</ul>
<ul class="navList">
@@ -100,7 +100,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<dl>
<dt>All Superinterfaces:</dt>
-<dd><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/util/CDONameProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDONameProvider</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOTimeProvider</a></dd>
+<dd><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/util/CDONameProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDONameProvider</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOTimeProvider</a></dd>
</dl>
<hr>
<br>
@@ -219,7 +219,7 @@ extends <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPo
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
<li><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html" title="interface in org.eclipse.emf.cdo.common.branch"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
</ul>
<ul class="navList">
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html
index f606c46de7..cc6403aff0 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html
@@ -99,6 +99,10 @@ var activeTableTab = "activeTableTab";
<ul class="blockList">
<li class="blockList">
<dl>
+<dt>All Superinterfaces:</dt>
+<dd><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/util/CDOVersionProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOVersionProvider</a></dd>
+</dl>
+<dl>
<dt>All Known Subinterfaces:</dt>
<dd><a href="../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisable.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisable</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevision</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionCache.EvictionEvent.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionCache.EvictionEvent</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDORevisionDelta</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionKey.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionKey</a>, <a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</a>, <a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionDelta.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevisionDelta</a></dd>
</dl>
@@ -108,7 +112,8 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>public interface <span class="typeNameLabel">CDOBranchVersion</span></pre>
+<pre>public interface <span class="typeNameLabel">CDOBranchVersion</span>
+extends <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/util/CDOVersionProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOVersionProvider</a></pre>
<div class="block">A pair of a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html#getBranch--"><code>branch</code></a> and an integer <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html#getVersion--"><code>version</code></a> number.
<p>
It is often used in the context of
@@ -245,6 +250,10 @@ var activeTableTab = "activeTableTab";
<h4>getBranch</h4>
<pre><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;getBranch()</pre>
<div class="block">Returns the branch of this branch version.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html#getBranch--">getBranch</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a></code></dd>
+</dl>
</li>
</ul>
<a name="getVersion--">
@@ -255,6 +264,10 @@ var activeTableTab = "activeTableTab";
<h4>getVersion</h4>
<pre>int&nbsp;getVersion()</pre>
<div class="block">Returns the version number of this branch version.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../../../org/eclipse/emf/cdo/common/util/CDOVersionProvider.html#getVersion--">getVersion</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../../org/eclipse/emf/cdo/common/util/CDOVersionProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOVersionProvider</a></code></dd>
+</dl>
</li>
</ul>
</li>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranch.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranch.html
index 8881512c8f..de14e45b25 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranch.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranch.html
@@ -255,36 +255,40 @@
</tr>
<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CDOBranchProvider.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html#getBranch--">getBranch</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a></code></td>
<td class="colLast"><span class="typeNameLabel">CDOBranchVersion.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html#getBranch--">getBranch</a></span>()</code>
<div class="block">Returns the branch of this branch version.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a></code></td>
<td class="colLast"><span class="typeNameLabel">CDOBranchManager.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchManager.html#getBranch-int-">getBranch</a></span>(int&nbsp;branchID)</code>
<div class="block">Returns the branch with the given unique integer ID.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a></code></td>
<td class="colLast"><span class="typeNameLabel">CDOBranch.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getBranch-java.lang.String-">getBranch</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path)</code>
<div class="block">Returns the sub branch of this branch with the given relative path, or <code>null</code> if no sub branch with this
path exists in this branch.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a></code></td>
<td class="colLast"><span class="typeNameLabel">CDOBranchManager.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchManager.html#getBranch-java.lang.String-">getBranch</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path)</code>
<div class="block">Returns the branch with the given absolute path.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>[]</code></td>
<td class="colLast"><span class="typeNameLabel">CDOBranch.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getBranches--">getBranches</a></span>()</code>
<div class="block">Returns an array of the sub branches of this branch, never <code>null</code>.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a></code></td>
<td class="colLast"><span class="typeNameLabel">CDOBranchManager.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchManager.html#getMainBranch--">getMainBranch</a></span>()</code>
<div class="block">Returns the main branch of the branch tree managed by this branch manager.</div>
@@ -363,6 +367,11 @@
<td class="colLast"><span class="typeNameLabel">CDOCommitInfoManager.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getFirstOfBranch-org.eclipse.emf.cdo.common.branch.CDOBranch-">getFirstOfBranch</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch)</code>&nbsp;</td>
</tr>
<tr class="rowColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><span class="typeNameLabel">CDOCommitInfoManager.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getLastCommitOfBranch-org.eclipse.emf.cdo.common.branch.CDOBranch-boolean-">getLastCommitOfBranch</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch,
+ boolean&nbsp;loadOnDemand)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a></code></td>
<td class="colLast"><span class="typeNameLabel">CDOCommitInfoManager.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getLastOfBranch-org.eclipse.emf.cdo.common.branch.CDOBranch-">getLastOfBranch</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch)</code>&nbsp;</td>
</tr>
@@ -677,6 +686,19 @@
</tr>
<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">IStoreAccessor.Raw2.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.Raw2.html#rawStore-org.eclipse.emf.cdo.common.branch.CDOBranch-long-long-java.lang.String-java.lang.String-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.net4j.util.om.monitor.OMMonitor-">rawStore</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch,
+ long&nbsp;timeStamp,
+ long&nbsp;previousTimeStamp,
+ <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;userID,
+ <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;comment,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;mergeSource,
+ <a href="../../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/monitor/OMMonitor.html?is-external=true" title="class or interface in org.eclipse.net4j.util.om.monitor">OMMonitor</a>&nbsp;monitor)</code>
+<div class="block">Stores the given <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit"><code>commit</code></a> in the backend represented by this <a href="../../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.Raw.html" title="interface in org.eclipse.emf.cdo.server"><code>raw
+ store accessor</code></a> without going through a regular <a href="../../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.html#commit-org.eclipse.net4j.util.om.monitor.OMMonitor-"><code>commit</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">IStoreAccessor.Raw.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.Raw.html#rawStore-org.eclipse.emf.cdo.common.branch.CDOBranch-long-long-java.lang.String-java.lang.String-org.eclipse.net4j.util.om.monitor.OMMonitor-">rawStore</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch,
long&nbsp;timeStamp,
long&nbsp;previousTimeStamp,
@@ -876,20 +898,35 @@
<tbody>
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a></code></td>
-<td class="colLast"><span class="typeNameLabel">InternalCDOCommitInfoManager.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/InternalCDOCommitInfoManager.html#createCommitInfo-org.eclipse.emf.cdo.common.branch.CDOBranch-long-long-java.lang.String-java.lang.String-org.eclipse.emf.cdo.common.commit.CDOCommitData-">createCommitInfo</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch,
+<td class="colLast"><span class="typeNameLabel">InternalCDOCommitInfoManager.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/InternalCDOCommitInfoManager.html#createCommitInfo-org.eclipse.emf.cdo.common.branch.CDOBranch-long-long-java.lang.String-java.lang.String-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.commit.CDOCommitData-">createCommitInfo</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch,
long&nbsp;timeStamp,
long&nbsp;previousTimeStamp,
<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;userID,
<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;comment,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;mergeSource,
<a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitData</a>&nbsp;commitData)</code>&nbsp;</td>
</tr>
<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a></code></td>
+<td class="colLast"><span class="typeNameLabel">InternalCDOCommitInfoManager.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/InternalCDOCommitInfoManager.html#createCommitInfo-org.eclipse.emf.cdo.common.branch.CDOBranch-long-long-java.lang.String-java.lang.String-org.eclipse.emf.cdo.common.commit.CDOCommitData-">createCommitInfo</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch,
+ long&nbsp;timeStamp,
+ long&nbsp;previousTimeStamp,
+ <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;userID,
+ <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;comment,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitData</a>&nbsp;commitData)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">InternalCDOCommitInfoManager.CommitInfoLoader.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/InternalCDOCommitInfoManager.CommitInfoLoader.html#loadCommitInfos-org.eclipse.emf.cdo.common.branch.CDOBranch-long-long-org.eclipse.emf.cdo.common.commit.CDOCommitInfoHandler-">loadCommitInfos</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch,
long&nbsp;startTime,
long&nbsp;endTime,
<a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoHandler.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfoHandler</a>&nbsp;handler)</code>&nbsp;</td>
</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">InternalCDOCommitInfoManager.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/InternalCDOCommitInfoManager.html#setLastCommitOfBranch-org.eclipse.emf.cdo.common.branch.CDOBranch-long-">setLastCommitOfBranch</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch,
+ long&nbsp;lastCommit)</code>&nbsp;</td>
+</tr>
</tbody>
</table>
<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
@@ -1091,36 +1128,50 @@
<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;lockAreaID)</code>&nbsp;</td>
</tr>
<tr class="altColor">
-<td class="colFirst"><code>protected abstract void</code></td>
-<td class="colLast"><span class="typeNameLabel">StoreAccessor.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/server/StoreAccessor.html#writeCommitInfo-org.eclipse.emf.cdo.common.branch.CDOBranch-long-long-java.lang.String-java.lang.String-org.eclipse.net4j.util.om.monitor.OMMonitor-">writeCommitInfo</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch,
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><span class="typeNameLabel">StoreAccessor.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/server/StoreAccessor.html#writeCommitInfo-org.eclipse.emf.cdo.common.branch.CDOBranch-long-long-java.lang.String-java.lang.String-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.net4j.util.om.monitor.OMMonitor-">writeCommitInfo</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch,
long&nbsp;timeStamp,
long&nbsp;previousTimeStamp,
<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;userID,
<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;comment,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;mergeSource,
<a href="../../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/monitor/OMMonitor.html?is-external=true" title="class or interface in org.eclipse.net4j.util.om.monitor">OMMonitor</a>&nbsp;monitor)</code>&nbsp;</td>
</tr>
<tr class="rowColor">
+<td class="colFirst"><code>protected abstract void</code></td>
+<td class="colLast"><span class="typeNameLabel">StoreAccessor.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/server/StoreAccessor.html#writeCommitInfo-org.eclipse.emf.cdo.common.branch.CDOBranch-long-long-java.lang.String-java.lang.String-org.eclipse.net4j.util.om.monitor.OMMonitor-">writeCommitInfo</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch,
+ long&nbsp;timeStamp,
+ long&nbsp;previousTimeStamp,
+ <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;userID,
+ <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;comment,
+ <a href="../../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/monitor/OMMonitor.html?is-external=true" title="class or interface in org.eclipse.net4j.util.om.monitor">OMMonitor</a>&nbsp;monitor)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">As of 4.6 override <a href="../../../../../../../org/eclipse/emf/cdo/spi/server/StoreAccessor.html#writeCommitInfo-org.eclipse.emf.cdo.common.branch.CDOBranch-long-long-java.lang.String-java.lang.String-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.net4j.util.om.monitor.OMMonitor-"><code>StoreAccessor.writeCommitInfo(CDOBranch, long, long, String, String, CDOBranchPoint, OMMonitor)</code></a>.</span></div>
+</div>
+</td>
+</tr>
+<tr class="altColor">
<td class="colFirst"><code>protected void</code></td>
<td class="colLast"><span class="typeNameLabel">StoreAccessor.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/server/StoreAccessor.html#writeDirtyObjectRevisions-org.eclipse.emf.cdo.spi.server.InternalCommitContext-org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision:A-org.eclipse.emf.cdo.common.branch.CDOBranch-org.eclipse.net4j.util.om.monitor.OMMonitor-">writeDirtyObjectRevisions</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/spi/server/InternalCommitContext.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalCommitContext</a>&nbsp;context,
<a href="../../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</a>[]&nbsp;dirtyObjects,
<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch,
<a href="../../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/monitor/OMMonitor.html?is-external=true" title="class or interface in org.eclipse.net4j.util.om.monitor">OMMonitor</a>&nbsp;monitor)</code>&nbsp;</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>protected void</code></td>
<td class="colLast"><span class="typeNameLabel">StoreAccessor.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/server/StoreAccessor.html#writeNewObjectRevisions-org.eclipse.emf.cdo.spi.server.InternalCommitContext-org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision:A-org.eclipse.emf.cdo.common.branch.CDOBranch-org.eclipse.net4j.util.om.monitor.OMMonitor-">writeNewObjectRevisions</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/spi/server/InternalCommitContext.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalCommitContext</a>&nbsp;context,
<a href="../../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</a>[]&nbsp;newObjects,
<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch,
<a href="../../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/monitor/OMMonitor.html?is-external=true" title="class or interface in org.eclipse.net4j.util.om.monitor">OMMonitor</a>&nbsp;monitor)</code>&nbsp;</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>protected abstract void</code></td>
<td class="colLast"><span class="typeNameLabel">StoreAccessor.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/server/StoreAccessor.html#writeRevisionDeltas-org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionDelta:A-org.eclipse.emf.cdo.common.branch.CDOBranch-long-org.eclipse.net4j.util.om.monitor.OMMonitor-">writeRevisionDeltas</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionDelta.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevisionDelta</a>[]&nbsp;revisionDeltas,
<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch,
long&nbsp;created,
<a href="../../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/monitor/OMMonitor.html?is-external=true" title="class or interface in org.eclipse.net4j.util.om.monitor">OMMonitor</a>&nbsp;monitor)</code>&nbsp;</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>protected abstract void</code></td>
<td class="colLast"><span class="typeNameLabel">StoreAccessor.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/server/StoreAccessor.html#writeRevisions-org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision:A-org.eclipse.emf.cdo.common.branch.CDOBranch-org.eclipse.net4j.util.om.monitor.OMMonitor-">writeRevisions</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</a>[]&nbsp;revisions,
<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch,
@@ -1183,6 +1234,20 @@
</td>
</tr>
<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CDOPushTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranch-org.eclipse.emf.cdo.transaction.CDOMerger-">merge</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;source,
+ <a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CDOTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranch-org.eclipse.emf.cdo.transaction.CDOMerger-">merge</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;source,
+ <a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</code>
+<div class="block">Merges the changes from the given source branch into this transaction and possibly considers previous merges
+ from that branch by inspecting the <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getMergeSource--"><code>merge source</code></a>
+ information of the <a href="../../../../../../../org/eclipse/emf/cdo/session/CDOSession.html#getCommitInfoManager--"><code>commit history</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a></code></td>
<td class="colLast"><span class="typeNameLabel">CDOTransactionContainer.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionContainer.html#openTransaction-org.eclipse.emf.cdo.common.branch.CDOBranch-">openTransaction</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch)</code>
<div class="block">Opens and returns a new <a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transaction</code></a> on a new EMF <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/resource/ResourceSet.html?is-external=true" title="class or interface in org.eclipse.emf.ecore.resource"><code>resource set</code></a>.</div>
@@ -1314,10 +1379,14 @@
</td>
</tr>
<tr class="altColor">
+<td class="colFirst"><code><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CommitHistoryComposite.LabelProvider.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.LabelProvider.html#getBranchString-org.eclipse.emf.cdo.common.branch.CDOBranch-">getBranchString</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">SelectTimeStampComposite.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/ui/widgets/SelectTimeStampComposite.html#setBranch-org.eclipse.emf.cdo.common.branch.CDOBranch-">setBranch</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch)</code>&nbsp;</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">CommitHistoryComposite.LabelProvider.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.LabelProvider.html#setInputBranch-org.eclipse.emf.cdo.common.branch.CDOBranch-">setInputBranch</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;inputBranch)</code>&nbsp;</td>
</tr>
@@ -1365,6 +1434,20 @@
</a>
<h3>Uses of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a> in <a href="../../../../../../../org/eclipse/emf/cdo/util/package-summary.html">org.eclipse.emf.cdo.util</a></h3>
<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../../../org/eclipse/emf/cdo/util/package-summary.html">org.eclipse.emf.cdo.util</a> that return <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CDOUtil.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/util/CDOUtil.html#createBranch-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-java.lang.String-">createBranch</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;base,
+ <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
<caption><span>Methods in <a href="../../../../../../../org/eclipse/emf/cdo/util/package-summary.html">org.eclipse.emf.cdo.util</a> with parameters of type <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a></span><span class="tabEnd">&nbsp;</span></caption>
<tr>
<th class="colFirst" scope="col">Modifier and Type</th>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPoint.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPoint.html
index 65abc10f78..8011a9b6a2 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPoint.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPoint.html
@@ -379,6 +379,10 @@
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></code></td>
<td class="colLast"><span class="typeNameLabel">CDOChangeSet.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html#getAncestorPoint--">getAncestorPoint</a></span>()</code>&nbsp;</td>
</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CDOCommitInfo.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getMergeSource--">getMergeSource</a></span>()</code>&nbsp;</td>
+</tr>
</tbody>
</table>
</li>
@@ -882,6 +886,10 @@
<div class="block">Returns the branch ID and timestamp of this commit operation.</div>
</td>
</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></code></td>
+<td class="colLast"><span class="typeNameLabel">IStoreAccessor.CommitContext.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.CommitContext.html#getCommitMergeSource--">getCommitMergeSource</a></span>()</code>&nbsp;</td>
+</tr>
</tbody>
</table>
<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
@@ -958,6 +966,19 @@
<a href="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionProvider.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionProvider</a>&nbsp;revisionProvider)</code>&nbsp;</td>
</tr>
<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">IStoreAccessor.Raw2.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.Raw2.html#rawStore-org.eclipse.emf.cdo.common.branch.CDOBranch-long-long-java.lang.String-java.lang.String-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.net4j.util.om.monitor.OMMonitor-">rawStore</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch,
+ long&nbsp;timeStamp,
+ long&nbsp;previousTimeStamp,
+ <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;userID,
+ <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;comment,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;mergeSource,
+ <a href="../../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/monitor/OMMonitor.html?is-external=true" title="class or interface in org.eclipse.net4j.util.om.monitor">OMMonitor</a>&nbsp;monitor)</code>
+<div class="block">Stores the given <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit"><code>commit</code></a> in the backend represented by this <a href="../../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.Raw.html" title="interface in org.eclipse.emf.cdo.server"><code>raw
+ store accessor</code></a> without going through a regular <a href="../../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.html#commit-org.eclipse.net4j.util.om.monitor.OMMonitor-"><code>commit</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a></code></td>
<td class="colLast"><span class="typeNameLabel">IStoreAccessor.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.html#readResourceID-org.eclipse.emf.cdo.common.id.CDOID-java.lang.String-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">readResourceID</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>&nbsp;folderID,
<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
@@ -966,7 +987,7 @@
folderID and name exists in the store, <code>null</code> otherwise.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</a></code></td>
<td class="colLast"><span class="typeNameLabel">IStoreAccessor.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.html#readRevision-org.eclipse.emf.cdo.common.id.CDOID-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-int-org.eclipse.emf.cdo.common.revision.CDORevisionCacheAdder-">readRevision</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>&nbsp;id,
<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;branchPoint,
@@ -1069,6 +1090,19 @@
</tr>
</tbody>
</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing fields, and an explanation">
+<caption><span>Fields in <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/branch/package-summary.html">org.eclipse.emf.cdo.spi.common.branch</a> declared as <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CDOBranchUtil.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html#AUTO_BRANCH_POINT">AUTO_BRANCH_POINT</a></span></code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
<caption><span>Methods in <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/branch/package-summary.html">org.eclipse.emf.cdo.spi.common.branch</a> that return <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></span><span class="tabEnd">&nbsp;</span></caption>
<tr>
@@ -1103,6 +1137,10 @@
<td class="colFirst"><code>static <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></code></td>
<td class="colLast"><span class="typeNameLabel">CDOBranchUtil.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html#normalizeBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">normalizeBranchPoint</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;branchPoint)</code>&nbsp;</td>
</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CDOBranchUtil.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html#readBranchPointOrNull-org.eclipse.emf.cdo.common.protocol.CDODataInput-">readBranchPointOrNull</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/protocol/CDODataInput.html" title="interface in org.eclipse.emf.cdo.common.protocol">CDODataInput</a>&nbsp;in)</code>&nbsp;</td>
+</tr>
</tbody>
</table>
<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
@@ -1144,6 +1182,11 @@
<td class="colFirst"><code>static <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></code></td>
<td class="colLast"><span class="typeNameLabel">CDOBranchUtil.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html#normalizeBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">normalizeBranchPoint</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;branchPoint)</code>&nbsp;</td>
</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><span class="typeNameLabel">CDOBranchUtil.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html#writeBranchPointOrNull-org.eclipse.emf.cdo.common.protocol.CDODataOutput-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">writeBranchPointOrNull</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/protocol/CDODataOutput.html" title="interface in org.eclipse.emf.cdo.common.protocol">CDODataOutput</a>&nbsp;out,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;point)</code>&nbsp;</td>
+</tr>
</tbody>
</table>
</li>
@@ -1191,10 +1234,55 @@
</tr>
<tbody>
<tr class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">CDOChangeSetSegment.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html#contains-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">contains</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;branchPoint)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">CDOChangeSetSegment.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html#contains-org.eclipse.emf.cdo.spi.common.commit.CDOChangeSetSegment:A-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">contains</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDOChangeSetSegment</a>[]&nbsp;segments,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;branchPoint)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a></code></td>
+<td class="colLast"><span class="typeNameLabel">InternalCDOCommitInfoManager.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/InternalCDOCommitInfoManager.html#createCommitInfo-org.eclipse.emf.cdo.common.branch.CDOBranch-long-long-java.lang.String-java.lang.String-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.commit.CDOCommitData-">createCommitInfo</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch,
+ long&nbsp;timeStamp,
+ long&nbsp;previousTimeStamp,
+ <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;userID,
+ <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;comment,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;mergeSource,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitData</a>&nbsp;commitData)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code>static <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDOChangeSetSegment</a>[]</code></td>
<td class="colLast"><span class="typeNameLabel">CDOChangeSetSegment.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html#createFrom-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">createFrom</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;startPoint,
<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;endPoint)</code>&nbsp;</td>
</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDOChangeSetSegment</a>[]</code></td>
+<td class="colLast"><span class="typeNameLabel">CDOChangeSetSegment.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html#createFrom-long-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">createFrom</a></span>(long&nbsp;startTime,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;endPoint)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><span class="typeNameLabel">CDOChangeSetSegment.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html#handleSegments-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.spi.common.commit.CDOChangeSetSegment.Handler-">handleSegments</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;startPoint,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;endPoint,
+ <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.Handler.html" title="interface in org.eclipse.emf.cdo.spi.common.commit">CDOChangeSetSegment.Handler</a>&nbsp;handler)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><span class="typeNameLabel">CDOChangeSetSegment.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html#handleSegments-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.spi.common.commit.CDOChangeSetSegment.Handler-">handleSegments</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;endPoint,
+ <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.Handler.html" title="interface in org.eclipse.emf.cdo.spi.common.commit">CDOChangeSetSegment.Handler</a>&nbsp;handler)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><span class="typeNameLabel">CDOChangeSetSegment.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html#handleSegments-long-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.spi.common.commit.CDOChangeSetSegment.Handler-">handleSegments</a></span>(long&nbsp;startTime,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;endPoint,
+ <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.Handler.html" title="interface in org.eclipse.emf.cdo.spi.common.commit">CDOChangeSetSegment.Handler</a>&nbsp;handler)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">CDORevisionAvailabilityInfo.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html#setBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">setBranchPoint</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;branchPoint)</code>&nbsp;</td>
+</tr>
</tbody>
</table>
<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
@@ -1206,6 +1294,10 @@
<tr class="altColor">
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html#CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">CDORevisionAvailabilityInfo</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;branchPoint)</code>&nbsp;</td>
</tr>
+<tr class="rowColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html#CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.revision.CDORevisionManager-">CDORevisionAvailabilityInfo</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;branchPoint,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionManager.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionManager</a>&nbsp;revisionManager)</code>&nbsp;</td>
+</tr>
</tbody>
</table>
</li>
@@ -1658,6 +1750,20 @@
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">InternalView.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/server/InternalView.html#setBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">setBranchPoint</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;branchPoint)</code>&nbsp;</td>
</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">InternalCommitContext.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/server/InternalCommitContext.html#setCommitMergeSource-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">setCommitMergeSource</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;mergeSource)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><span class="typeNameLabel">StoreAccessor.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/server/StoreAccessor.html#writeCommitInfo-org.eclipse.emf.cdo.common.branch.CDOBranch-long-long-java.lang.String-java.lang.String-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.net4j.util.om.monitor.OMMonitor-">writeCommitInfo</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch,
+ long&nbsp;timeStamp,
+ long&nbsp;previousTimeStamp,
+ <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;userID,
+ <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;comment,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;mergeSource,
+ <a href="../../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/monitor/OMMonitor.html?is-external=true" title="class or interface in org.eclipse.net4j.util.om.monitor">OMMonitor</a>&nbsp;monitor)</code>&nbsp;</td>
+</tr>
</tbody>
</table>
<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
@@ -1714,6 +1820,19 @@
</tbody>
</table>
<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../../../org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</a> that return <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CDOCommitContext.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html#getCommitMergeSource--">getCommitMergeSource</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
<caption><span>Methods in <a href="../../../../../../../org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</a> with parameters of type <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></span><span class="tabEnd">&nbsp;</span></caption>
<tr>
<th class="colFirst" scope="col">Modifier and Type</th>
@@ -1721,49 +1840,76 @@
</tr>
<tbody>
<tr class="altColor">
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">CDOTransactionCommentator.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.html#appendMerge-java.lang.StringBuilder-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">appendMerge</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/StringBuilder.html?is-external=true" title="class or interface in java.lang">StringBuilder</a>&nbsp;builder,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;mergeSource)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a></code></td>
<td class="colLast"><span class="typeNameLabel">CDOPushTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#compareRevisions-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">compareRevisions</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source)</code>&nbsp;</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CDOPushTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
+<td class="colLast"><span class="typeNameLabel">CDOPushTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;sourceBase,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;targetBase,
<a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</code>&nbsp;</td>
</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CDOTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;sourceBase,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;targetBase,
+ <a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</code>
+<div class="block">Merges the changes between the given source base point and the given source point into this transaction.</div>
+</td>
+</tr>
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CDOTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
+<td class="colLast"><span class="typeNameLabel">CDOPushTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;sourceBase,
<a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</code>&nbsp;</td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CDOPushTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
- <a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">CDOTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;sourceBase,
+ <a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</code>
+<div class="block">Merges the changes between the given source base point and the given source point into this transaction.</div>
+</td>
</tr>
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CDOTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
+<td class="colLast"><span class="typeNameLabel">CDOPushTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
<a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</code>&nbsp;</td>
</tr>
<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CDOTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
+ <a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</code>
+<div class="block">Merges the changes from the given source point into this transaction and possibly considers previous merges
+ from that <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getBranch--"><code>branch</code></a> by inspecting the <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getMergeSource--"><code>merge source</code></a>
+ information of the <a href="../../../../../../../org/eclipse/emf/cdo/session/CDOSession.html#getCommitInfoManager--"><code>commit history</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a></code></td>
<td class="colLast"><span class="typeNameLabel">CDOTransactionContainer.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionContainer.html#openTransaction-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">openTransaction</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;target)</code>
<div class="block">Opens and returns a new <a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transaction</code></a> on a new EMF <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/resource/ResourceSet.html?is-external=true" title="class or interface in org.eclipse.emf.ecore.resource"><code>resource set</code></a>.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a></code></td>
<td class="colLast"><span class="typeNameLabel">CDOTransactionOpener.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionOpener.html#openTransaction-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.ecore.resource.ResourceSet-">openTransaction</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;target,
<a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/resource/ResourceSet.html?is-external=true" title="class or interface in org.eclipse.emf.ecore.resource">ResourceSet</a>&nbsp;resourceSet)</code>
<div class="block">Opens and returns a new <a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transaction</code></a> on the given EMF <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/resource/ResourceSet.html?is-external=true" title="class or interface in org.eclipse.emf.ecore.resource"><code>resource set</code></a>.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><span class="typeNameLabel">CDOPushTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#setBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">setBranchPoint</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;branchPoint)</code>&nbsp;</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><span class="typeNameLabel">CDOPushTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#setBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.core.runtime.IProgressMonitor-">setBranchPoint</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;branchPoint,
<a href="http://help.eclipse.org/topic//org.eclipse.platform.doc.isv/reference/api/org/eclipse/core/runtime/IProgressMonitor.html?is-external=true" title="class or interface in org.eclipse.core.runtime">IProgressMonitor</a>&nbsp;monitor)</code>&nbsp;</td>
@@ -1915,6 +2061,20 @@
</tr>
</tbody>
</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../../../org/eclipse/emf/cdo/util/package-summary.html">org.eclipse.emf.cdo.util</a> with parameters of type <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CDOUtil.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/util/CDOUtil.html#createBranch-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-java.lang.String-">createBranch</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;base,
+ <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
<caption><span>Constructors in <a href="../../../../../../../org/eclipse/emf/cdo/util/package-summary.html">org.eclipse.emf.cdo.util</a> with parameters of type <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></span><span class="tabEnd">&nbsp;</span></caption>
<tr>
@@ -2080,24 +2240,44 @@
<tbody>
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></code></td>
-<td class="colLast"><span class="typeNameLabel">InternalCDOSession.MergeData.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getAncestor--">getAncestor</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">InternalCDOSession.MergeData.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getAncestor--">getAncestor</a></span>()</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">As of 4.6 use <a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getTargetBase--"><code>InternalCDOSession.MergeData.getTargetBase()</code></a>.</span></div>
+</div>
+</td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></code></td>
+<td class="colLast"><span class="typeNameLabel">InternalCDOTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.html#getCommitMergeSource--">getCommitMergeSource</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></code></td>
<td class="colLast"><span class="typeNameLabel">InternalCDOSession.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#getCommittedSinceLastRefresh-org.eclipse.emf.cdo.common.id.CDOID-">getCommittedSinceLastRefresh</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>&nbsp;id)</code>&nbsp;</td>
</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.MergeDataResult.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.MergeDataResult.html#getResultBase--">getResultBase</a></span>()</code>&nbsp;</td>
+</tr>
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></code></td>
-<td class="colLast"><span class="typeNameLabel">InternalCDOSession.MergeData.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getSource--">getSource</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">InternalCDOSession.MergeData.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getResultBase--">getResultBase</a></span>()</code>&nbsp;</td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></code></td>
-<td class="colLast"><span class="typeNameLabel">InternalCDOSession.MergeData.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getSourceBase--">getSourceBase</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">InternalCDOSession.MergeData.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getSource--">getSource</a></span>()</code>&nbsp;</td>
</tr>
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></code></td>
+<td class="colLast"><span class="typeNameLabel">InternalCDOSession.MergeData.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getSourceBase--">getSourceBase</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></code></td>
<td class="colLast"><span class="typeNameLabel">InternalCDOSession.MergeData.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getTarget--">getTarget</a></span>()</code>&nbsp;</td>
</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></code></td>
+<td class="colLast"><span class="typeNameLabel">InternalCDOSession.MergeData.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getTargetBase--">getTargetBase</a></span>()</code>&nbsp;</td>
+</tr>
<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></code></td>
<td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#openView-int-boolean-java.lang.String-">openView</a></span>(int&nbsp;viewID,
@@ -2116,7 +2296,7 @@
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.ApplyChangeSetResult.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOTransaction.ApplyChangeSetResult</a></code></td>
<td class="colLast"><span class="typeNameLabel">InternalCDOTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.html#applyChangeSet-org.eclipse.emf.cdo.common.commit.CDOChangeSetData-org.eclipse.emf.cdo.common.revision.CDORevisionProvider-org.eclipse.emf.cdo.common.revision.CDORevisionProvider-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-boolean-">applyChangeSet</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a>&nbsp;changeSetData,
- <a href="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionProvider.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionProvider</a>&nbsp;ancestorProvider,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionProvider.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionProvider</a>&nbsp;targetBaseProvider,
<a href="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionProvider.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionProvider</a>&nbsp;targetProvider,
<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
boolean&nbsp;keepVersions)</code>&nbsp;</td>
@@ -2124,7 +2304,7 @@
<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Pair.html?is-external=true" title="class or interface in org.eclipse.net4j.util.collection">Pair</a>&lt;<a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a>,<a href="../../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Pair.html?is-external=true" title="class or interface in org.eclipse.net4j.util.collection">Pair</a>&lt;<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="../../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>,<a href="../../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>&gt;,<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>&gt;&gt;&gt;</code></td>
<td class="colLast"><span class="typeNameLabel">InternalCDOTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.html#applyChangeSetData-org.eclipse.emf.cdo.common.commit.CDOChangeSetData-org.eclipse.emf.cdo.common.revision.CDORevisionProvider-org.eclipse.emf.cdo.common.revision.CDORevisionProvider-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">applyChangeSetData</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a>&nbsp;changeSetData,
- <a href="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionProvider.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionProvider</a>&nbsp;ancestorProvider,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionProvider.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionProvider</a>&nbsp;targetBaseProvider,
<a href="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionProvider.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionProvider</a>&nbsp;targetProvider,
<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source)</code>
<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -2149,15 +2329,27 @@
boolean&nbsp;computeChangeSets)</code>&nbsp;</td>
</tr>
<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</a></code></td>
+<td class="colLast"><span class="typeNameLabel">InternalCDOSession.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#getMergeData-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-boolean-">getMergeData</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;target,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;targetBase,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;sourceBase,
+ boolean&nbsp;computeChangeSets)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#openView-int-boolean-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">openView</a></span>(int&nbsp;viewID,
boolean&nbsp;readOnly,
<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;branchPoint)</code>&nbsp;</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.CommitTransactionResult.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.CommitTransactionResult.html#setBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">setBranchPoint</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;branchPoint)</code>&nbsp;</td>
</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">InternalCDOTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.html#setCommitMergeSource-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">setCommitMergeSource</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;mergeSource)</code>&nbsp;</td>
+</tr>
<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">InternalCDOSession.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#setCommittedSinceLastRefresh-org.eclipse.emf.cdo.common.id.CDOID-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">setCommittedSinceLastRefresh</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>&nbsp;id,
@@ -2165,6 +2357,10 @@
</tr>
<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.MergeDataResult.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.MergeDataResult.html#setResultBase-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">setResultBase</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;resultBase)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#switchTarget-int-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-java.util.List-java.util.List-java.util.List-org.eclipse.net4j.util.om.monitor.OMMonitor-">switchTarget</a></span>(int&nbsp;viewID,
<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;branchPoint,
<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOObject.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOObject</a>&gt;&nbsp;invalidObjects,
@@ -2227,14 +2423,33 @@
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#MergeData-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-java.util.Set-org.eclipse.emf.cdo.common.commit.CDOChangeSet-org.eclipse.emf.cdo.common.commit.CDOChangeSet-">MergeData</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;target,
<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;sourceBase,
- <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;ancestor,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;targetBase,
<a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</a>&nbsp;targetInfo,
<a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</a>&nbsp;sourceInfo,
- <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</a>&nbsp;baseInfo,
- <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</a>&nbsp;ancestorInfo,
+ <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</a>&nbsp;sourceBaseInfo,
+ <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</a>&nbsp;targetBaseInfo,
<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>&gt;&nbsp;ids,
<a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</a>&nbsp;targetChanges,
- <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</a>&nbsp;sourceChanges)</code>&nbsp;</td>
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</a>&nbsp;sourceChanges)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">As of 4.6 use <code>#MergeData(CDOBranchPoint, CDORevisionAvailabilityInfo, CDOBranchPoint, CDORevisionAvailabilityInfo, Set, CDOChangeSet, CDOBranchPoint, CDORevisionAvailabilityInfo, CDOBranchPoint, CDORevisionAvailabilityInfo, Set, CDOChangeSet, CDOBranchPoint)</code>.</span></div>
+</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#MergeData-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-java.util.Set-org.eclipse.emf.cdo.common.commit.CDOChangeSet-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-java.util.Set-org.eclipse.emf.cdo.common.commit.CDOChangeSet-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">MergeData</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;target,
+ <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</a>&nbsp;targetInfo,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;targetBase,
+ <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</a>&nbsp;targetBaseInfo,
+ <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>&gt;&nbsp;targetIDs,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</a>&nbsp;targetChanges,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
+ <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</a>&nbsp;sourceInfo,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;sourceBase,
+ <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</a>&nbsp;sourceBaseInfo,
+ <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>&gt;&nbsp;sourceIDs,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</a>&nbsp;sourceChanges,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;resultBase)</code>&nbsp;</td>
</tr>
</tbody>
</table>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPointRange.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPointRange.html
index 5e3ee48f7e..10f24fc263 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPointRange.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPointRange.html
@@ -178,6 +178,33 @@
<td class="colLast"><span class="typeNameLabel">CDOBranchUtil.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html#createRange-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">createRange</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;startPoint,
<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;endPoint)</code>&nbsp;</td>
</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPointRange</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CDOBranchUtil.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html#readRange-org.eclipse.emf.cdo.common.protocol.CDODataInput-">readRange</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/protocol/CDODataInput.html" title="interface in org.eclipse.emf.cdo.common.protocol">CDODataInput</a>&nbsp;in)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPointRange</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CDOBranchUtil.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html#readRangeOrNull-org.eclipse.emf.cdo.common.protocol.CDODataInput-">readRangeOrNull</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/protocol/CDODataInput.html" title="interface in org.eclipse.emf.cdo.common.protocol">CDODataInput</a>&nbsp;in)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/branch/package-summary.html">org.eclipse.emf.cdo.spi.common.branch</a> with parameters of type <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPointRange</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><span class="typeNameLabel">CDOBranchUtil.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html#writeRange-org.eclipse.emf.cdo.common.protocol.CDODataOutput-org.eclipse.emf.cdo.common.branch.CDOBranchPointRange-">writeRange</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/protocol/CDODataOutput.html" title="interface in org.eclipse.emf.cdo.common.protocol">CDODataOutput</a>&nbsp;out,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPointRange</a>&nbsp;range)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><span class="typeNameLabel">CDOBranchUtil.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html#writeRangeOrNull-org.eclipse.emf.cdo.common.protocol.CDODataOutput-org.eclipse.emf.cdo.common.branch.CDOBranchPointRange-">writeRangeOrNull</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/protocol/CDODataOutput.html" title="interface in org.eclipse.emf.cdo.common.protocol">CDODataOutput</a>&nbsp;out,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPointRange</a>&nbsp;range)</code>&nbsp;</td>
+</tr>
</tbody>
</table>
</li>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranchProvider.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranchProvider.html
new file mode 100644
index 0000000000..b027aad86e
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranchProvider.html
@@ -0,0 +1,840 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+
+<title>Uses of Interface org.eclipse.emf.cdo.common.branch.CDOBranchProvider (CDO Model Repository Documentation)</title>
+<meta name="date" content="">
+<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="Uses of Interface org.eclipse.emf.cdo.common.branch.CDOBranchProvider (CDO Model Repository Documentation)";
+ }
+ }
+ catch(err) {
+ }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../../index.html?org/eclipse/emf/cdo/common/branch/class-use/CDOBranchProvider.html" target="_top">Frames</a></li>
+<li><a href="CDOBranchProvider.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Interface org.eclipse.emf.cdo.common.branch.CDOBranchProvider" class="title">Uses of Interface<br>org.eclipse.emf.cdo.common.branch.CDOBranchProvider</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.eclipse.emf.cdo">org.eclipse.emf.cdo</a></td>
+<td class="colLast">
+<div class="block">Client concepts like <a href="../../../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><code>CDOObject</code></a> and <a href="../../../../../../../org/eclipse/emf/cdo/CDOState.html" title="enum in org.eclipse.emf.cdo"><code>CDOState</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#org.eclipse.emf.cdo.common">org.eclipse.emf.cdo.common</a></td>
+<td class="colLast">
+<div class="block">Common concepts that are differently extended in clients and servers.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.eclipse.emf.cdo.common.branch">org.eclipse.emf.cdo.common.branch</a></td>
+<td class="colLast">
+<div class="block">Common concepts for dealing with branches.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#org.eclipse.emf.cdo.common.commit">org.eclipse.emf.cdo.common.commit</a></td>
+<td class="colLast">
+<div class="block">Common concepts for dealing with commits and change sets.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.eclipse.emf.cdo.common.lock">org.eclipse.emf.cdo.common.lock</a></td>
+<td class="colLast">
+<div class="block">Common concepts for dealing with durable locks and views.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#org.eclipse.emf.cdo.common.revision">org.eclipse.emf.cdo.common.revision</a></td>
+<td class="colLast">
+<div class="block">Common concepts for dealing with revisions and revision lists.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.eclipse.emf.cdo.common.revision.delta">org.eclipse.emf.cdo.common.revision.delta</a></td>
+<td class="colLast">
+<div class="block">Common concepts for dealing with revision deltas and feature deltas.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#org.eclipse.emf.cdo.server">org.eclipse.emf.cdo.server</a></td>
+<td class="colLast">
+<div class="block">Server concepts for dealing with repositories and stores.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.eclipse.emf.cdo.session">org.eclipse.emf.cdo.session</a></td>
+<td class="colLast">
+<div class="block">Client concepts for dealing with sessions to CDO repositories.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#org.eclipse.emf.cdo.spi.common.branch">org.eclipse.emf.cdo.spi.common.branch</a></td>
+<td class="colLast">
+<div class="block">Common service provider interfaces and useful base implementations for dealing with branches.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.eclipse.emf.cdo.spi.common.commit">org.eclipse.emf.cdo.spi.common.commit</a></td>
+<td class="colLast">
+<div class="block">Common service provider interfaces and useful base implementations for dealing with commits and change sets.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#org.eclipse.emf.cdo.spi.common.revision">org.eclipse.emf.cdo.spi.common.revision</a></td>
+<td class="colLast">
+<div class="block">Common service provider interfaces and useful base implementations for dealing with revisions and deltas.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.eclipse.emf.cdo.spi.server">org.eclipse.emf.cdo.spi.server</a></td>
+<td class="colLast">
+<div class="block">Server service provider interfaces and useful base implementations.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#org.eclipse.emf.cdo.transaction">org.eclipse.emf.cdo.transaction</a></td>
+<td class="colLast">
+<div class="block">Client concepts for dealing with transactions, distributed transactions and their save points.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.eclipse.emf.cdo.view">org.eclipse.emf.cdo.view</a></td>
+<td class="colLast">
+<div class="block">Client concepts for dealing with views, view sets, queries, CDO objects and EMF resource sets.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#org.eclipse.emf.spi.cdo">org.eclipse.emf.spi.cdo</a></td>
+<td class="colLast">
+<div class="block">Client service provider interfaces and useful base implementations.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="org.eclipse.emf.cdo">
+<!-- -->
+</a>
+<h3>Uses of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/package-summary.html">org.eclipse.emf.cdo</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subinterfaces, and an explanation">
+<caption><span>Subinterfaces of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/package-summary.html">org.eclipse.emf.cdo</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/CDOObjectHistory.html" title="interface in org.eclipse.emf.cdo">CDOObjectHistory</a></span></code>
+<div class="block">A cache for the <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit"><code>commit infos</code></a> of an <a href="../../../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><code>object</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.eclipse.emf.cdo.common">
+<!-- -->
+</a>
+<h3>Uses of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/common/package-summary.html">org.eclipse.emf.cdo.common</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subinterfaces, and an explanation">
+<caption><span>Subinterfaces of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/common/package-summary.html">org.eclipse.emf.cdo.common</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/CDOCommonTransaction.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonTransaction</a></span></code>
+<div class="block">Abstracts the information about CDO transactions that is common to both client and server side.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonView</a></span></code>
+<div class="block">Abstracts the information about CDO views that is common to both client and server side.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.eclipse.emf.cdo.common.branch">
+<!-- -->
+</a>
+<h3>Uses of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/package-summary.html">org.eclipse.emf.cdo.common.branch</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subinterfaces, and an explanation">
+<caption><span>Subinterfaces of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/package-summary.html">org.eclipse.emf.cdo.common.branch</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a></span></code>
+<div class="block">Represents a <i>stream of changes</i> that is isolated from other streams of changes.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchChangedEvent.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchChangedEvent</a></span></code>
+<div class="block">An <a href="../../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.event"><code>event</code></a> fired from a <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchManager.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch manager</code></a> when a new <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a> has
+ been created.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchCreatedEvent.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchCreatedEvent</a></span></code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">As of 4.3 use <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchChangedEvent.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>CDOBranchChangedEvent</code></a>.</span></div>
+</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></span></code>
+<div class="block">A <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getTimeStamp--"><code>point in time</code></a> in a particular <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getBranch--"><code>branch</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchTag.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchTag</a></span></code>
+<div class="block">A persistent, named <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch point</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchVersion</a></span></code>
+<div class="block">A pair of a <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html#getBranch--"><code>branch</code></a> and an integer <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html#getVersion--"><code>version</code></a> number.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.eclipse.emf.cdo.common.commit">
+<!-- -->
+</a>
+<h3>Uses of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/package-summary.html">org.eclipse.emf.cdo.common.commit</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subinterfaces, and an explanation">
+<caption><span>Subinterfaces of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/package-summary.html">org.eclipse.emf.cdo.common.commit</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitHistory.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitHistory</a></span></code>
+<div class="block">A cache for the <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit"><code>commit infos</code></a> of a branch or of an entire repository.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitHistory.TriggerLoadElement.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitHistory.TriggerLoadElement</a></span></code>
+<div class="block">A virtual <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitHistory.html" title="interface in org.eclipse.emf.cdo.common.commit"><code>history</code></a> element that can be returned from <a href="../../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.html?is-external=true#getElements--" title="class or interface in org.eclipse.net4j.util.container"><code>IContainer.getElements()</code></a>
+ if <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitHistory.html#isAppendingTriggerLoadElement--"><code>CDOCommitHistory.isAppendingTriggerLoadElement()</code></a> is <code>true</code> to indicate that
+ the history is not <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitHistory.html#isFull--"><code>fully</code></a> loaded, yet.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a></span></code>
+<div class="block"><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitData.html" title="interface in org.eclipse.emf.cdo.common.commit"><code>Commit data</code></a> in the context of a <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html" title="interface in org.eclipse.emf.cdo.common.commit"><code>commit info manager</code></a> with
+ additional commit informations.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.eclipse.emf.cdo.common.lock">
+<!-- -->
+</a>
+<h3>Uses of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/common/lock/package-summary.html">org.eclipse.emf.cdo.common.lock</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subinterfaces, and an explanation">
+<caption><span>Subinterfaces of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/common/lock/package-summary.html">org.eclipse.emf.cdo.common.lock</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockChangeInfo.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockChangeInfo</a></span></code>
+<div class="block">Represents a change in the lock state of a set of objects.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockArea.html" title="interface in org.eclipse.emf.cdo.common.lock">IDurableLockingManager.LockArea</a></span></code>
+<div class="block">Encapsulates the persistable information about a single durable CDO view like <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch point</code></a>
+ and acquired locks.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.eclipse.emf.cdo.common.revision">
+<!-- -->
+</a>
+<h3>Uses of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/common/revision/package-summary.html">org.eclipse.emf.cdo.common.revision</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subinterfaces, and an explanation">
+<caption><span>Subinterfaces of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/common/revision/package-summary.html">org.eclipse.emf.cdo.common.revision</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/revision/CDOIDAndBranch.html" title="interface in org.eclipse.emf.cdo.common.revision">CDOIDAndBranch</a></span></code>
+<div class="block">An <a href="../../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id"><code>ID</code></a> / <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a> pair.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisable.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisable</a></span></code>
+<div class="block">An entity that has a defined lifetime (creation plus revision) and a version in a <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevision</a></span></code>
+<div class="block">Encapsulates the immutable system information of a <b>single</b> CDO <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EObject.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><code>object</code></a> between two
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit"><code>commits</code></a> in a <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a> and provides access to its modeled
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionData.html" title="interface in org.eclipse.emf.cdo.common.revision"><code>data</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionCache.EvictionEvent.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionCache.EvictionEvent</a></span></code>
+<div class="block">An <a href="../../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.event"><code>event</code></a> fired from a <a href="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionCache.html" title="interface in org.eclipse.emf.cdo.common.revision"><code>revision cache</code></a> for <a href="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><code>revisions</code></a> that
+ are evicted because they are no longer strongly referenced when free memory runs low.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionKey.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionKey</a></span></code>
+<div class="block">Uniquely identifies a <a href="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><code>revision</code></a> by version in a <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.eclipse.emf.cdo.common.revision.delta">
+<!-- -->
+</a>
+<h3>Uses of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/common/revision/delta/package-summary.html">org.eclipse.emf.cdo.common.revision.delta</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subinterfaces, and an explanation">
+<caption><span>Subinterfaces of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/common/revision/delta/package-summary.html">org.eclipse.emf.cdo.common.revision.delta</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDORevisionDelta</a></span></code>
+<div class="block">Represents the change delta between two <a href="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><code>revisions</code></a> of a CDO object.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.eclipse.emf.cdo.server">
+<!-- -->
+</a>
+<h3>Uses of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/server/package-summary.html">org.eclipse.emf.cdo.server</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subinterfaces, and an explanation">
+<caption><span>Subinterfaces of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/server/package-summary.html">org.eclipse.emf.cdo.server</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/server/IQueryContext.html" title="interface in org.eclipse.emf.cdo.server">IQueryContext</a></span></code>
+<div class="block">Represents the execution state of a <a href="../../../../../../../org/eclipse/emf/cdo/view/CDOQuery.html" title="interface in org.eclipse.emf.cdo.view"><code>query</code></a> in the server towards a <a href="../../../../../../../org/eclipse/emf/cdo/server/IQueryHandler.html" title="interface in org.eclipse.emf.cdo.server"><code>query
+ handler</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.QueryResourcesContext.html" title="interface in org.eclipse.emf.cdo.server">IStoreAccessor.QueryResourcesContext</a></span></code>
+<div class="block">Represents the query execution state of a <a href="../../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.html#queryResources-org.eclipse.emf.cdo.server.IStoreAccessor.QueryResourcesContext-"><code>resources
+ query</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.QueryResourcesContext.ExactMatch.html" title="interface in org.eclipse.emf.cdo.server">IStoreAccessor.QueryResourcesContext.ExactMatch</a></span></code>
+<div class="block">Represents the query execution state of a <a href="../../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.html#queryResources-org.eclipse.emf.cdo.server.IStoreAccessor.QueryResourcesContext-"><code>resources
+ query</code></a> that is supposed to deliver one exact resource, or <code>null</code>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.QueryXRefsContext.html" title="interface in org.eclipse.emf.cdo.server">IStoreAccessor.QueryXRefsContext</a></span></code>
+<div class="block">Represents the query execution state of a <a href="../../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.html#queryXRefs-org.eclipse.emf.cdo.server.IStoreAccessor.QueryXRefsContext-"><code>XRefs query</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/server/ITransaction.html" title="interface in org.eclipse.emf.cdo.server">ITransaction</a></span></code>
+<div class="block">The server-side representation of a client <a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transaction</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/server/IView.html" title="interface in org.eclipse.emf.cdo.server">IView</a></span></code>
+<div class="block">The server-side representation of a client <a href="../../../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><code>view</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.eclipse.emf.cdo.session">
+<!-- -->
+</a>
+<h3>Uses of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/session/package-summary.html">org.eclipse.emf.cdo.session</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subinterfaces, and an explanation">
+<caption><span>Subinterfaces of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/session/package-summary.html">org.eclipse.emf.cdo.session</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.html" title="interface in org.eclipse.emf.cdo.session">CDOSessionInvalidationEvent</a></span></code>
+<div class="block">A <a href="../../../../../../../org/eclipse/emf/cdo/session/CDOSessionEvent.html" title="interface in org.eclipse.emf.cdo.session"><code>session event</code></a> fired when passive updates (commit notifications) are being received from a
+ remote repository.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/session/CDOSessionLocksChangedEvent.html" title="interface in org.eclipse.emf.cdo.session">CDOSessionLocksChangedEvent</a></span></code>
+<div class="block">A <a href="../../../../../../../org/eclipse/emf/cdo/session/CDOSessionEvent.html" title="interface in org.eclipse.emf.cdo.session"><code>session event</code></a> fired when lock-change notifications are received from a remote repository.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.eclipse.emf.cdo.spi.common.branch">
+<!-- -->
+</a>
+<h3>Uses of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/branch/package-summary.html">org.eclipse.emf.cdo.spi.common.branch</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subinterfaces, and an explanation">
+<caption><span>Subinterfaces of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/branch/package-summary.html">org.eclipse.emf.cdo.spi.common.branch</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranch.html" title="interface in org.eclipse.emf.cdo.spi.common.branch">InternalCDOBranch</a></span></code>
+<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.eclipse.emf.cdo.spi.common.commit">
+<!-- -->
+</a>
+<h3>Uses of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/package-summary.html">org.eclipse.emf.cdo.spi.common.commit</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/package-summary.html">org.eclipse.emf.cdo.spi.common.commit</a> that implement <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDOChangeSetSegment</a></span></code>
+<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.eclipse.emf.cdo.spi.common.revision">
+<!-- -->
+</a>
+<h3>Uses of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/revision/package-summary.html">org.eclipse.emf.cdo.spi.common.revision</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subinterfaces, and an explanation">
+<caption><span>Subinterfaces of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/revision/package-summary.html">org.eclipse.emf.cdo.spi.common.revision</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</a></span></code>
+<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionDelta.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevisionDelta</a></span></code>
+<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/revision/package-summary.html">org.eclipse.emf.cdo.spi.common.revision</a> that implement <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/revision/AbstractCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">AbstractCDORevision</a></span></code>
+<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">BaseCDORevision</a></span></code>
+<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">DelegatingCDORevision</a></span></code>
+<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/revision/DetachedCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">DetachedCDORevision</a></span></code>
+<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/revision/PointerCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">PointerCDORevision</a></span></code>
+<div class="block">A <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/revision/SyntheticCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision"><code>synthetic</code></a> revision that represents the initial period of an object in a
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a> when the object is still associated with a revision from one of the baseline branches.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/revision/StubCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">StubCDORevision</a></span></code>
+<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/revision/SyntheticCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">SyntheticCDORevision</a></span></code>
+<div class="block">A synthetic revision that represents the initial period of an object in a <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a> when the object is
+ still associated with a revision from one of the baseline branches.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.eclipse.emf.cdo.spi.server">
+<!-- -->
+</a>
+<h3>Uses of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/spi/server/package-summary.html">org.eclipse.emf.cdo.spi.server</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subinterfaces, and an explanation">
+<caption><span>Subinterfaces of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/spi/server/package-summary.html">org.eclipse.emf.cdo.spi.server</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/server/InternalTransaction.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalTransaction</a></span></code>
+<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/server/InternalView.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalView</a></span></code>
+<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../../../../../../org/eclipse/emf/cdo/spi/server/package-summary.html">org.eclipse.emf.cdo.spi.server</a> that implement <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/server/DelegatingQueryResourcesContext.html" title="class in org.eclipse.emf.cdo.spi.server">DelegatingQueryResourcesContext</a></span></code>
+<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/server/DurableLockArea.html" title="class in org.eclipse.emf.cdo.spi.server">DurableLockArea</a></span></code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">Use <a href="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockUtil.html#createLockArea-java.lang.String-java.lang.String-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-boolean-java.util.Map-"><code>CDOLockUtil.createLockArea(String, String, CDOBranchPoint, boolean, Map)</code></a> instead</span></div>
+</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.eclipse.emf.cdo.transaction">
+<!-- -->
+</a>
+<h3>Uses of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subinterfaces, and an explanation">
+<caption><span>Subinterfaces of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html" title="interface in org.eclipse.emf.cdo.transaction">CDOCommitContext</a></span></code>
+<div class="block">Provides a context for commit operations.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a></span></code>
+<div class="block">A read-write view to the <em>current</em> (i.e.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../../../../../../org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</a> that implement <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</a></span></code>
+<div class="block">A <a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transaction</code></a> that persists changes to the object graph locally on commit and can later load
+ these changes and push them to the <a href="../../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><code>repository</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.eclipse.emf.cdo.view">
+<!-- -->
+</a>
+<h3>Uses of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/view/package-summary.html">org.eclipse.emf.cdo.view</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subinterfaces, and an explanation">
+<caption><span>Subinterfaces of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/cdo/view/package-summary.html">org.eclipse.emf.cdo.view</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view">CDOView</a></span></code>
+<div class="block">A read-only view to the state of the object graph in the repository of the underlying <a href="../../../../../../../org/eclipse/emf/cdo/session/CDOSession.html" title="interface in org.eclipse.emf.cdo.session"><code>session</code></a> at a
+ specific <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getTimeStamp--"><code>time</code></a> at a specific <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getBranch--"><code>branch</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/view/CDOViewLocksChangedEvent.html" title="interface in org.eclipse.emf.cdo.view">CDOViewLocksChangedEvent</a></span></code>
+<div class="block">A <a href="../../../../../../../org/eclipse/emf/cdo/view/CDOViewEvent.html" title="interface in org.eclipse.emf.cdo.view"><code>view event</code></a> fired when <a href="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockChangeInfo.html" title="interface in org.eclipse.emf.cdo.common.lock"><code>lock changes</code></a> are being received from a remote
+ repository.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.eclipse.emf.spi.cdo">
+<!-- -->
+</a>
+<h3>Uses of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subinterfaces, and an explanation">
+<caption><span>Subinterfaces of <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a> in <a href="../../../../../../../org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSessionInvalidationEvent.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOSessionInvalidationEvent</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOTransaction</a></span></code>
+<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.InternalCDOCommitContext.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOTransaction.InternalCDOCommitContext</a></span></code>
+<div class="block">Provides a context for a commit operation.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOView</a></span></code>
+<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOXATransaction.InternalCDOXACommitContext.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOXATransaction.InternalCDOXACommitContext</a></span></code>
+<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../../../../../../org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</a> that implement <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.CommitTransactionResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.CommitTransactionResult</a></span></code>
+<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../../index.html?org/eclipse/emf/cdo/common/branch/class-use/CDOBranchProvider.html" target="_top">Frames</a></li>
+<li><a href="CDOBranchProvider.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small><i class="copyright">Copyright (c) 2014 Eike Stepper (Berlin, Germany) and others.<br>All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html</i></small></p>
+</body>
+</html>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-frame.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-frame.html
index dcc780a47a..bd98440892 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-frame.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-frame.html
@@ -21,6 +21,7 @@
<li><a href="CDOBranchManager.html" title="interface in org.eclipse.emf.cdo.common.branch" target="classFrame"><span class="interfaceName">CDOBranchManager</span></a></li>
<li><a href="CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch" target="classFrame"><span class="interfaceName">CDOBranchPoint</span></a></li>
<li><a href="CDOBranchPointRange.html" title="interface in org.eclipse.emf.cdo.common.branch" target="classFrame"><span class="interfaceName">CDOBranchPointRange</span></a></li>
+<li><a href="CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch" target="classFrame"><span class="interfaceName">CDOBranchProvider</span></a></li>
<li><a href="CDOBranchTag.html" title="interface in org.eclipse.emf.cdo.common.branch" target="classFrame"><span class="interfaceName">CDOBranchTag</span></a></li>
<li><a href="CDOBranchVersion.html" title="interface in org.eclipse.emf.cdo.common.branch" target="classFrame"><span class="interfaceName">CDOBranchVersion</span></a></li>
</ul>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-summary.html
index fbe8970b6e..fd29b55293 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-summary.html
@@ -130,17 +130,23 @@
<td class="colFirst"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPointRange</a></td>
<td class="colLast">
<div class="block">A range between the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getBase--"><code>base</code></a> of the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchManager.html#getMainBranch--"><code>main branch</code></a> and
- the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getHead--"><code>head</code></a> of any branch that is demarkated by a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getStartPoint--"><code>start point</code></a> and
+ the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getHead--"><code>head</code></a> of any branch that is demarcated by a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getStartPoint--"><code>start point</code></a> and
an <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getEndPoint--"><code>end point</code></a>.</div>
</td>
</tr>
<tr class="altColor">
+<td class="colFirst"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a></td>
+<td class="colLast">
+<div class="block">Provides the consumer with a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchTag.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchTag</a></td>
<td class="colLast">
<div class="block">A persistent, named <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch point</code></a>.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchVersion</a></td>
<td class="colLast">
<div class="block">A pair of a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html#getBranch--"><code>branch</code></a> and an integer <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html#getVersion--"><code>version</code></a> number.</div>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-use.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-use.html
index 4f40b55ab2..6105739378 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-use.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-use.html
@@ -82,198 +82,204 @@
</tr>
<tbody>
<tr class="altColor">
+<td class="colFirst"><a href="#org.eclipse.emf.cdo">org.eclipse.emf.cdo</a></td>
+<td class="colLast">
+<div class="block">Client concepts like <a href="../../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><code>CDOObject</code></a> and <a href="../../../../../../org/eclipse/emf/cdo/CDOState.html" title="enum in org.eclipse.emf.cdo"><code>CDOState</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.common">org.eclipse.emf.cdo.common</a></td>
<td class="colLast">
<div class="block">Common concepts that are differently extended in clients and servers.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.common.branch">org.eclipse.emf.cdo.common.branch</a></td>
<td class="colLast">
<div class="block">Common concepts for dealing with branches.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.common.commit">org.eclipse.emf.cdo.common.commit</a></td>
<td class="colLast">
<div class="block">Common concepts for dealing with commits and change sets.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.common.id">org.eclipse.emf.cdo.common.id</a></td>
<td class="colLast">
<div class="block">Common concepts for dealing with object and revision IDs.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.common.lock">org.eclipse.emf.cdo.common.lock</a></td>
<td class="colLast">
<div class="block">Common concepts for dealing with durable locks and views.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.common.protocol">org.eclipse.emf.cdo.common.protocol</a></td>
<td class="colLast">
<div class="block">Common concepts for dealing with protocols and CDO-specific I/O.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.common.revision">org.eclipse.emf.cdo.common.revision</a></td>
<td class="colLast">
<div class="block">Common concepts for dealing with revisions and revision lists.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.common.revision.delta">org.eclipse.emf.cdo.common.revision.delta</a></td>
<td class="colLast">
<div class="block">Common concepts for dealing with revision deltas and feature deltas.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.common.security">org.eclipse.emf.cdo.common.security</a></td>
<td class="colLast">
<div class="block">Common concepts for dealing with permissions and protectable entities.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.common.util">org.eclipse.emf.cdo.common.util</a></td>
<td class="colLast">
<div class="block">Common utility classes, some common interfaces and exceptions.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.explorer.checkouts">org.eclipse.emf.cdo.explorer.checkouts</a></td>
<td class="colLast">
<div class="block">Interfaces for working with <a href="../../../../../../org/eclipse/emf/cdo/explorer/checkouts/CDOCheckout.html" title="interface in org.eclipse.emf.cdo.explorer.checkouts"><code>checkouts</code></a>.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.net4j">org.eclipse.emf.cdo.net4j</a></td>
<td class="colLast">
<div class="block">Client concepts for dealing with Net4j-based sessions to remote repositories.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.security">org.eclipse.emf.cdo.security</a></td>
<td class="colLast">
<div class="block">The generated EMF API of the CDO security model.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.security.impl">org.eclipse.emf.cdo.security.impl</a></td>
<td class="colLast">
<div class="block">The generated EMF implementation of the CDO security model.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.security.util">org.eclipse.emf.cdo.security.util</a></td>
<td class="colLast">
<div class="block">The generated EMF utilities of the CDO security model.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.server">org.eclipse.emf.cdo.server</a></td>
<td class="colLast">
<div class="block">Server concepts for dealing with repositories and stores.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.server.db.mapping">org.eclipse.emf.cdo.server.db.mapping</a></td>
<td class="colLast">
<div class="block">Server concepts for dealing with mapping strategies and mappings for classes, lists and types.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.server.ocl">org.eclipse.emf.cdo.server.ocl</a></td>
<td class="colLast">
<div class="block">Server implementation of a generic OCL query handler.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.session">org.eclipse.emf.cdo.session</a></td>
<td class="colLast">
<div class="block">Client concepts for dealing with sessions to CDO repositories.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.spi.common">org.eclipse.emf.cdo.spi.common</a></td>
<td class="colLast">
<div class="block">Common service provider interfaces and useful base implementations.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.spi.common.branch">org.eclipse.emf.cdo.spi.common.branch</a></td>
<td class="colLast">
<div class="block">Common service provider interfaces and useful base implementations for dealing with branches.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.spi.common.commit">org.eclipse.emf.cdo.spi.common.commit</a></td>
<td class="colLast">
<div class="block">Common service provider interfaces and useful base implementations for dealing with commits and change sets.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.spi.common.protocol">org.eclipse.emf.cdo.spi.common.protocol</a></td>
<td class="colLast">
<div class="block">Common base implementations for dealing with I/O of CDO data structures.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.spi.common.revision">org.eclipse.emf.cdo.spi.common.revision</a></td>
<td class="colLast">
<div class="block">Common service provider interfaces and useful base implementations for dealing with revisions and deltas.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.spi.server">org.eclipse.emf.cdo.spi.server</a></td>
<td class="colLast">
<div class="block">Server service provider interfaces and useful base implementations.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.spi.workspace">org.eclipse.emf.cdo.spi.workspace</a></td>
<td class="colLast">
<div class="block">Server provider interfaces (SPI) for CDO <a href="../../../../../../org/eclipse/emf/cdo/workspace/CDOWorkspace.html" title="interface in org.eclipse.emf.cdo.workspace"><code>workspaces</code></a>.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.transaction">org.eclipse.emf.cdo.transaction</a></td>
<td class="colLast">
<div class="block">Client concepts for dealing with transactions, distributed transactions and their save points.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.ui">org.eclipse.emf.cdo.ui</a></td>
<td class="colLast">
<div class="block">Reusable UI components specific to the CDO Model Repository.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.ui.compare">org.eclipse.emf.cdo.ui.compare</a></td>
<td class="colLast">
<div class="block">Classes that help to open EMF Compare user interfaces on CDO models.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.ui.widgets">org.eclipse.emf.cdo.ui.widgets</a></td>
<td class="colLast">
<div class="block">A library with reusable widgets.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.util">org.eclipse.emf.cdo.util</a></td>
<td class="colLast">
<div class="block">Client utility classes, some common interfaces and exceptions.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.eclipse.emf.cdo.view">org.eclipse.emf.cdo.view</a></td>
<td class="colLast">
<div class="block">Client concepts for dealing with views, view sets, queries, CDO objects and EMF resource sets.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.eclipse.emf.spi.cdo">org.eclipse.emf.spi.cdo</a></td>
<td class="colLast">
<div class="block">Client service provider interfaces and useful base implementations.</div>
@@ -282,6 +288,23 @@
</tbody>
</table>
</li>
+<li class="blockList"><a name="org.eclipse.emf.cdo">
+<!-- -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../../../../../org/eclipse/emf/cdo/common/branch/package-summary.html">org.eclipse.emf.cdo.common.branch</a> used by <a href="../../../../../../org/eclipse/emf/cdo/package-summary.html">org.eclipse.emf.cdo</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchProvider.html#org.eclipse.emf.cdo">CDOBranchProvider</a>
+<div class="block">Provides the consumer with a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
<li class="blockList"><a name="org.eclipse.emf.cdo.common">
<!-- -->
</a>
@@ -296,6 +319,11 @@
<div class="block">A <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getTimeStamp--"><code>point in time</code></a> in a particular <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getBranch--"><code>branch</code></a>.</div>
</td>
</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchProvider.html#org.eclipse.emf.cdo.common">CDOBranchProvider</a>
+<div class="block">Provides the consumer with a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a>.</div>
+</td>
+</tr>
</tbody>
</table>
</li>
@@ -338,6 +366,11 @@
</td>
</tr>
<tr class="altColor">
+<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchProvider.html#org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a>
+<div class="block">Provides the consumer with a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchVersion.html#org.eclipse.emf.cdo.common.branch">CDOBranchVersion</a>
<div class="block">A pair of a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html#getBranch--"><code>branch</code></a> and an integer <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html#getVersion--"><code>version</code></a> number.</div>
</td>
@@ -367,10 +400,15 @@
<tr class="altColor">
<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPointRange.html#org.eclipse.emf.cdo.common.commit">CDOBranchPointRange</a>
<div class="block">A range between the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getBase--"><code>base</code></a> of the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchManager.html#getMainBranch--"><code>main branch</code></a> and
- the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getHead--"><code>head</code></a> of any branch that is demarkated by a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getStartPoint--"><code>start point</code></a> and
+ the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getHead--"><code>head</code></a> of any branch that is demarcated by a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getStartPoint--"><code>start point</code></a> and
an <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getEndPoint--"><code>end point</code></a>.</div>
</td>
</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchProvider.html#org.eclipse.emf.cdo.common.commit">CDOBranchProvider</a>
+<div class="block">Provides the consumer with a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a>.</div>
+</td>
+</tr>
</tbody>
</table>
</li>
@@ -410,6 +448,11 @@
<div class="block">A <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getTimeStamp--"><code>point in time</code></a> in a particular <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getBranch--"><code>branch</code></a>.</div>
</td>
</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchProvider.html#org.eclipse.emf.cdo.common.lock">CDOBranchProvider</a>
+<div class="block">Provides the consumer with a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a>.</div>
+</td>
+</tr>
</tbody>
</table>
</li>
@@ -467,11 +510,16 @@
<tr class="rowColor">
<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPointRange.html#org.eclipse.emf.cdo.common.revision">CDOBranchPointRange</a>
<div class="block">A range between the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getBase--"><code>base</code></a> of the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchManager.html#getMainBranch--"><code>main branch</code></a> and
- the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getHead--"><code>head</code></a> of any branch that is demarkated by a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getStartPoint--"><code>start point</code></a> and
+ the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getHead--"><code>head</code></a> of any branch that is demarcated by a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getStartPoint--"><code>start point</code></a> and
an <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getEndPoint--"><code>end point</code></a>.</div>
</td>
</tr>
<tr class="altColor">
+<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchProvider.html#org.eclipse.emf.cdo.common.revision">CDOBranchProvider</a>
+<div class="block">Provides the consumer with a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchVersion.html#org.eclipse.emf.cdo.common.revision">CDOBranchVersion</a>
<div class="block">A pair of a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html#getBranch--"><code>branch</code></a> and an integer <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html#getVersion--"><code>version</code></a> number.</div>
</td>
@@ -489,6 +537,11 @@
</tr>
<tbody>
<tr class="altColor">
+<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchProvider.html#org.eclipse.emf.cdo.common.revision.delta">CDOBranchProvider</a>
+<div class="block">Provides the consumer with a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchVersion.html#org.eclipse.emf.cdo.common.revision.delta">CDOBranchVersion</a>
<div class="block">A pair of a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html#getBranch--"><code>branch</code></a> and an integer <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html#getVersion--"><code>version</code></a> number.</div>
</td>
@@ -640,6 +693,11 @@
</td>
</tr>
<tr class="rowColor">
+<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchProvider.html#org.eclipse.emf.cdo.server">CDOBranchProvider</a>
+<div class="block">Provides the consumer with a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchVersion.html#org.eclipse.emf.cdo.server">CDOBranchVersion</a>
<div class="block">A pair of a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html#getBranch--"><code>branch</code></a> and an integer <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html#getVersion--"><code>version</code></a> number.</div>
</td>
@@ -705,6 +763,11 @@
<div class="block">A <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getTimeStamp--"><code>point in time</code></a> in a particular <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getBranch--"><code>branch</code></a>.</div>
</td>
</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchProvider.html#org.eclipse.emf.cdo.session">CDOBranchProvider</a>
+<div class="block">Provides the consumer with a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a>.</div>
+</td>
+</tr>
</tbody>
</table>
</li>
@@ -760,11 +823,16 @@
<tr class="rowColor">
<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPointRange.html#org.eclipse.emf.cdo.spi.common.branch">CDOBranchPointRange</a>
<div class="block">A range between the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getBase--"><code>base</code></a> of the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchManager.html#getMainBranch--"><code>main branch</code></a> and
- the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getHead--"><code>head</code></a> of any branch that is demarkated by a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getStartPoint--"><code>start point</code></a> and
+ the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getHead--"><code>head</code></a> of any branch that is demarcated by a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getStartPoint--"><code>start point</code></a> and
an <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getEndPoint--"><code>end point</code></a>.</div>
</td>
</tr>
<tr class="altColor">
+<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchProvider.html#org.eclipse.emf.cdo.spi.common.branch">CDOBranchProvider</a>
+<div class="block">Provides the consumer with a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchVersion.html#org.eclipse.emf.cdo.spi.common.branch">CDOBranchVersion</a>
<div class="block">A pair of a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html#getBranch--"><code>branch</code></a> and an integer <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html#getVersion--"><code>version</code></a> number.</div>
</td>
@@ -791,6 +859,11 @@
<div class="block">A <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getTimeStamp--"><code>point in time</code></a> in a particular <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getBranch--"><code>branch</code></a>.</div>
</td>
</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchProvider.html#org.eclipse.emf.cdo.spi.common.commit">CDOBranchProvider</a>
+<div class="block">Provides the consumer with a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a>.</div>
+</td>
+</tr>
</tbody>
</table>
</li>
@@ -853,11 +926,16 @@
<tr class="rowColor">
<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPointRange.html#org.eclipse.emf.cdo.spi.common.revision">CDOBranchPointRange</a>
<div class="block">A range between the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getBase--"><code>base</code></a> of the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchManager.html#getMainBranch--"><code>main branch</code></a> and
- the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getHead--"><code>head</code></a> of any branch that is demarkated by a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getStartPoint--"><code>start point</code></a> and
+ the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getHead--"><code>head</code></a> of any branch that is demarcated by a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getStartPoint--"><code>start point</code></a> and
an <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getEndPoint--"><code>end point</code></a>.</div>
</td>
</tr>
<tr class="altColor">
+<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchProvider.html#org.eclipse.emf.cdo.spi.common.revision">CDOBranchProvider</a>
+<div class="block">Provides the consumer with a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchVersion.html#org.eclipse.emf.cdo.spi.common.revision">CDOBranchVersion</a>
<div class="block">A pair of a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html#getBranch--"><code>branch</code></a> and an integer <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html#getVersion--"><code>version</code></a> number.</div>
</td>
@@ -893,6 +971,11 @@
</td>
</tr>
<tr class="altColor">
+<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchProvider.html#org.eclipse.emf.cdo.spi.server">CDOBranchProvider</a>
+<div class="block">Provides the consumer with a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchVersion.html#org.eclipse.emf.cdo.spi.server">CDOBranchVersion</a>
<div class="block">A pair of a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html#getBranch--"><code>branch</code></a> and an integer <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html#getVersion--"><code>version</code></a> number.</div>
</td>
@@ -936,6 +1019,11 @@
<div class="block">A <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getTimeStamp--"><code>point in time</code></a> in a particular <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getBranch--"><code>branch</code></a>.</div>
</td>
</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchProvider.html#org.eclipse.emf.cdo.transaction">CDOBranchProvider</a>
+<div class="block">Provides the consumer with a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a>.</div>
+</td>
+</tr>
</tbody>
</table>
</li>
@@ -1017,7 +1105,7 @@
<tr class="altColor">
<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPointRange.html#org.eclipse.emf.cdo.util">CDOBranchPointRange</a>
<div class="block">A range between the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getBase--"><code>base</code></a> of the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchManager.html#getMainBranch--"><code>main branch</code></a> and
- the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getHead--"><code>head</code></a> of any branch that is demarkated by a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getStartPoint--"><code>start point</code></a> and
+ the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getHead--"><code>head</code></a> of any branch that is demarcated by a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getStartPoint--"><code>start point</code></a> and
an <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getEndPoint--"><code>end point</code></a>.</div>
</td>
</tr>
@@ -1043,6 +1131,11 @@
<div class="block">A <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getTimeStamp--"><code>point in time</code></a> in a particular <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getBranch--"><code>branch</code></a>.</div>
</td>
</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchProvider.html#org.eclipse.emf.cdo.view">CDOBranchProvider</a>
+<div class="block">Provides the consumer with a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a>.</div>
+</td>
+</tr>
</tbody>
</table>
</li>
@@ -1068,10 +1161,15 @@
<tr class="altColor">
<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPointRange.html#org.eclipse.emf.spi.cdo">CDOBranchPointRange</a>
<div class="block">A range between the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getBase--"><code>base</code></a> of the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchManager.html#getMainBranch--"><code>main branch</code></a> and
- the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getHead--"><code>head</code></a> of any branch that is demarkated by a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getStartPoint--"><code>start point</code></a> and
+ the <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getHead--"><code>head</code></a> of any branch that is demarcated by a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getStartPoint--"><code>start point</code></a> and
an <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.html#getEndPoint--"><code>end point</code></a>.</div>
</td>
</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchProvider.html#org.eclipse.emf.spi.cdo">CDOBranchProvider</a>
+<div class="block">Provides the consumer with a <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a>.</div>
+</td>
+</tr>
</tbody>
</table>
</li>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/class-use/CDOCommonRepository.CommitInfoStorage.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/class-use/CDOCommonRepository.CommitInfoStorage.html
new file mode 100644
index 0000000000..ca4a8a79f8
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/class-use/CDOCommonRepository.CommitInfoStorage.html
@@ -0,0 +1,202 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+
+<title>Uses of Class org.eclipse.emf.cdo.common.CDOCommonRepository.CommitInfoStorage (CDO Model Repository Documentation)</title>
+<meta name="date" content="">
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="Uses of Class org.eclipse.emf.cdo.common.CDOCommonRepository.CommitInfoStorage (CDO Model Repository Documentation)";
+ }
+ }
+ catch(err) {
+ }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?org/eclipse/emf/cdo/common/class-use/CDOCommonRepository.CommitInfoStorage.html" target="_top">Frames</a></li>
+<li><a href="CDOCommonRepository.CommitInfoStorage.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class org.eclipse.emf.cdo.common.CDOCommonRepository.CommitInfoStorage" class="title">Uses of Class<br>org.eclipse.emf.cdo.common.CDOCommonRepository.CommitInfoStorage</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.eclipse.emf.cdo.common">org.eclipse.emf.cdo.common</a></td>
+<td class="colLast">
+<div class="block">Common concepts that are differently extended in clients and servers.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#org.eclipse.emf.spi.cdo">org.eclipse.emf.spi.cdo</a></td>
+<td class="colLast">
+<div class="block">Client service provider interfaces and useful base implementations.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="org.eclipse.emf.cdo.common">
+<!-- -->
+</a>
+<h3>Uses of <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a> in <a href="../../../../../../org/eclipse/emf/cdo/common/package-summary.html">org.eclipse.emf.cdo.common</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../../org/eclipse/emf/cdo/common/package-summary.html">org.eclipse.emf.cdo.common</a> that return <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CDOCommonRepository.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html#getCommitInfoStorage--">getCommitInfoStorage</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CDOCommonRepository.CommitInfoStorage.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html#valueOf-java.lang.String-">valueOf</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a>[]</code></td>
+<td class="colLast"><span class="typeNameLabel">CDOCommonRepository.CommitInfoStorage.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html#values--">values</a></span>()</code>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.eclipse.emf.spi.cdo">
+<!-- -->
+</a>
+<h3>Uses of <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a> in <a href="../../../../../../org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../../org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</a> that return <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.CommitInfoStorage</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.OpenSessionResult.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.OpenSessionResult.html#getCommitInfoStorage--">getCommitInfoStorage</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.CommitInfoStorage.html" title="enum in org.eclipse.emf.cdo.common">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?org/eclipse/emf/cdo/common/class-use/CDOCommonRepository.CommitInfoStorage.html" target="_top">Frames</a></li>
+<li><a href="CDOCommonRepository.CommitInfoStorage.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small><i class="copyright">Copyright (c) 2014 Eike Stepper (Berlin, Germany) and others.<br>All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html</i></small></p>
+</body>
+</html>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.TriggerLoadElement.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.TriggerLoadElement.html
index 3fa60facc2..f3e7f56c48 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.TriggerLoadElement.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.TriggerLoadElement.html
@@ -100,7 +100,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<dl>
<dt>All Superinterfaces:</dt>
-<dd><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeKindProvider.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeKindProvider</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitData</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOTimeProvider</a></dd>
+<dd><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeKindProvider.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeKindProvider</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitData</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOTimeProvider</a></dd>
</dl>
<dl>
<dt>Enclosing interface:</dt>
@@ -160,7 +160,7 @@ extends <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitIn
<!-- -->
</a>
<h3>Methods inherited from interface&nbsp;org.eclipse.emf.cdo.common.commit.<a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a></h3>
-<code><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getComment--">getComment</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getCommitInfoManager--">getCommitInfoManager</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getPreviousTimeStamp--">getPreviousTimeStamp</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getUserID--">getUserID</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#isCommitDataLoaded--">isCommitDataLoaded</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#isInitialCommit--">isInitialCommit</a></code></li>
+<code><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getComment--">getComment</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getCommitInfoManager--">getCommitInfoManager</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getMergedCommitInfo--">getMergedCommitInfo</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getMergeSource--">getMergeSource</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getPreviousCommitInfo--">getPreviousCommitInfo</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getPreviousTimeStamp--">getPreviousTimeStamp</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getUserID--">getUserID</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#isCommitDataLoaded--">isCommitDataLoaded</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#isInitialCommit--">isInitialCommit</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.eclipse.emf.cdo.common.branch.CDOBranchPoint">
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.html
index d186a63387..0994674bec 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.html
@@ -100,7 +100,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<dl>
<dt>All Superinterfaces:</dt>
-<dd><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoHandler.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfoHandler</a>, <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.html?is-external=true" title="class or interface in org.eclipse.net4j.util.container">IContainer</a>&lt;<a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a>&gt;, <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/INotifier.html?is-external=true" title="class or interface in org.eclipse.net4j.util.event">INotifier</a></dd>
+<dd><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoHandler.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfoHandler</a>, <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.html?is-external=true" title="class or interface in org.eclipse.net4j.util.container">IContainer</a>&lt;<a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a>&gt;, <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/INotifier.html?is-external=true" title="class or interface in org.eclipse.net4j.util.event">INotifier</a></dd>
</dl>
<dl>
<dt>All Known Subinterfaces:</dt>
@@ -109,13 +109,17 @@ var activeTableTab = "activeTableTab";
<hr>
<br>
<pre>public interface <span class="typeNameLabel">CDOCommitHistory</span>
-extends <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.html?is-external=true" title="class or interface in org.eclipse.net4j.util.container">IContainer</a>&lt;<a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a>&gt;, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoHandler.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfoHandler</a></pre>
+extends <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.html?is-external=true" title="class or interface in org.eclipse.net4j.util.container">IContainer</a>&lt;<a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a>&gt;, <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoHandler.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfoHandler</a></pre>
<div class="block">A cache for the <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit"><code>commit infos</code></a> of a branch or of an entire repository.</div>
<dl>
<dt><span class="simpleTagLabel">Since:</span></dt>
<dd>4.2</dd>
<dt><span class="simpleTagLabel">Author:</span></dt>
<dd>Eike Stepper</dd>
+<dt><span class="simpleTagLabel">No Implement</span></dt>
+<dd>This interface is not intended to be implemented by clients.</dd>
+<dt><span class="simpleTagLabel">No Extend</span></dt>
+<dd>This interface is not intended to be extended by clients.</dd>
</dl>
</li>
</ul>
@@ -336,6 +340,10 @@ extends <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/
<li class="blockList">
<h4>getBranch</h4>
<pre><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;getBranch()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html#getBranch--">getBranch</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a></code></dd>
+</dl>
</li>
</ul>
<a name="isAppendingTriggerLoadElement--">
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html
index 116c8b34f5..819a6f8aa1 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6};
+var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -100,7 +100,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<dl>
<dt>All Superinterfaces:</dt>
-<dd><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeKindProvider.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeKindProvider</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitData</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOTimeProvider</a></dd>
+<dd><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeKindProvider.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeKindProvider</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitData</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOTimeProvider</a></dd>
</dl>
<dl>
<dt>All Known Subinterfaces:</dt>
@@ -165,18 +165,30 @@ extends <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPo
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getCommitInfoManager--">getCommitInfoManager</a></span>()</code>&nbsp;</td>
</tr>
<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getMergedCommitInfo--">getMergedCommitInfo</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getMergeSource--">getMergeSource</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getPreviousCommitInfo--">getPreviousCommitInfo</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
<td class="colFirst"><code>long</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getPreviousTimeStamp--">getPreviousTimeStamp</a></span>()</code>&nbsp;</td>
</tr>
-<tr id="i3" class="rowColor">
+<tr id="i6" class="altColor">
<td class="colFirst"><code><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getUserID--">getUserID</a></span>()</code>&nbsp;</td>
</tr>
-<tr id="i4" class="altColor">
+<tr id="i7" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#isCommitDataLoaded--">isCommitDataLoaded</a></span>()</code>&nbsp;</td>
</tr>
-<tr id="i5" class="rowColor">
+<tr id="i8" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#isInitialCommit--">isInitialCommit</a></span>()</code>
<div class="block">Returns <code>true</code> if this commit info describes the first initializing commit in the <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><code>repository</code></a>, <code>false</code> otherwise.</div>
@@ -247,6 +259,19 @@ extends <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPo
</dl>
</li>
</ul>
+<a name="getPreviousCommitInfo--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getPreviousCommitInfo</h4>
+<pre><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a>&nbsp;getPreviousCommitInfo()</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>4.6</dd>
+</dl>
+</li>
+</ul>
<a name="getUserID--">
<!-- -->
</a>
@@ -265,6 +290,32 @@ extends <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPo
<pre><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getComment()</pre>
</li>
</ul>
+<a name="getMergeSource--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMergeSource</h4>
+<pre><a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;getMergeSource()</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>4.6</dd>
+</dl>
+</li>
+</ul>
+<a name="getMergedCommitInfo--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMergedCommitInfo</h4>
+<pre><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a>&nbsp;getMergedCommitInfo()</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>4.6</dd>
+</dl>
+</li>
+</ul>
<a name="isInitialCommit--">
<!-- -->
</a>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html
index d8c942f31f..f40e55e585 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6};
+var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":6};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -110,7 +110,7 @@ var activeTableTab = "activeTableTab";
<br>
<pre>public interface <span class="typeNameLabel">CDOCommitInfoManager</span>
extends <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoProvider.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfoProvider</a>, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitHistory.Provider.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitHistory.Provider</a>&lt;<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>,<a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitHistory.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitHistory</a>&gt;</pre>
-<div class="block">Loads, provides and possible manages <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit"><code>commit info</code></a> objects.</div>
+<div class="block">Provides access to <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit"><code>commit info</code></a> objects.</div>
<dl>
<dt><span class="simpleTagLabel">Since:</span></dt>
<dd>3.0</dd>
@@ -157,13 +157,18 @@ extends <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitIn
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getCommitInfo-long-">getCommitInfo</a></span>(long&nbsp;timeStamp)</code>&nbsp;</td>
</tr>
<tr id="i3" class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getCommitInfo-long-boolean-">getCommitInfo</a></span>(long&nbsp;timeStamp,
+ boolean&nbsp;loadOnDemand)</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getCommitInfos-org.eclipse.emf.cdo.common.branch.CDOBranch-long-long-org.eclipse.emf.cdo.common.commit.CDOCommitInfoHandler-">getCommitInfos</a></span>(<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch,
long&nbsp;startTime,
long&nbsp;endTime,
<a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoHandler.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfoHandler</a>&nbsp;handler)</code>&nbsp;</td>
</tr>
-<tr id="i4" class="altColor">
+<tr id="i5" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getCommitInfos-org.eclipse.emf.cdo.common.branch.CDOBranch-long-java.lang.String-java.lang.String-int-org.eclipse.emf.cdo.common.commit.CDOCommitInfoHandler-">getCommitInfos</a></span>(<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch,
long&nbsp;startTime,
@@ -172,15 +177,24 @@ extends <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitIn
int&nbsp;count,
<a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoHandler.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfoHandler</a>&nbsp;handler)</code>&nbsp;</td>
</tr>
-<tr id="i5" class="rowColor">
+<tr id="i6" class="altColor">
<td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getFirstOfBranch-org.eclipse.emf.cdo.common.branch.CDOBranch-">getFirstOfBranch</a></span>(<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch)</code>&nbsp;</td>
</tr>
-<tr id="i6" class="altColor">
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getLastCommit--">getLastCommit</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getLastCommitOfBranch-org.eclipse.emf.cdo.common.branch.CDOBranch-boolean-">getLastCommitOfBranch</a></span>(<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch,
+ boolean&nbsp;loadOnDemand)</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
<td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getLastOfBranch-org.eclipse.emf.cdo.common.branch.CDOBranch-">getLastOfBranch</a></span>(<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch)</code>&nbsp;</td>
</tr>
-<tr id="i7" class="rowColor">
+<tr id="i10" class="altColor">
<td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonRepository</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getRepository--">getRepository</a></span>()</code>&nbsp;</td>
</tr>
@@ -239,6 +253,20 @@ extends <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitIn
</dl>
</li>
</ul>
+<a name="getCommitInfo-long-boolean-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getCommitInfo</h4>
+<pre><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a>&nbsp;getCommitInfo(long&nbsp;timeStamp,
+ boolean&nbsp;loadOnDemand)</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>4.6</dd>
+</dl>
+</li>
+</ul>
<a name="getCommitInfo-org.eclipse.emf.cdo.common.branch.CDOBranch-long-boolean-">
<!-- -->
</a>
@@ -313,7 +341,7 @@ extends <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitIn
<a name="getLastOfBranch-org.eclipse.emf.cdo.common.branch.CDOBranch-">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>getLastOfBranch</h4>
<pre><a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a>&nbsp;getLastOfBranch(<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch)</pre>
@@ -323,6 +351,33 @@ extends <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitIn
</dl>
</li>
</ul>
+<a name="getLastCommitOfBranch-org.eclipse.emf.cdo.common.branch.CDOBranch-boolean-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getLastCommitOfBranch</h4>
+<pre>long&nbsp;getLastCommitOfBranch(<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;branch,
+ boolean&nbsp;loadOnDemand)</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>4.6</dd>
+</dl>
+</li>
+</ul>
+<a name="getLastCommit--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getLastCommit</h4>
+<pre>long&nbsp;getLastCommit()</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>4.6</dd>
+</dl>
+</li>
+</ul>
</li>
</ul>
</li>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSet.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSet.html
index 4e4ed10dd3..ae8e11218f 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSet.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSet.html
@@ -211,14 +211,33 @@
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#MergeData-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-java.util.Set-org.eclipse.emf.cdo.common.commit.CDOChangeSet-org.eclipse.emf.cdo.common.commit.CDOChangeSet-">MergeData</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;target,
<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;sourceBase,
- <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;ancestor,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;targetBase,
<a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</a>&nbsp;targetInfo,
<a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</a>&nbsp;sourceInfo,
- <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</a>&nbsp;baseInfo,
- <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</a>&nbsp;ancestorInfo,
+ <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</a>&nbsp;sourceBaseInfo,
+ <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</a>&nbsp;targetBaseInfo,
<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>&gt;&nbsp;ids,
<a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</a>&nbsp;targetChanges,
- <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</a>&nbsp;sourceChanges)</code>&nbsp;</td>
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</a>&nbsp;sourceChanges)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">As of 4.6 use <code>#MergeData(CDOBranchPoint, CDORevisionAvailabilityInfo, CDOBranchPoint, CDORevisionAvailabilityInfo, Set, CDOChangeSet, CDOBranchPoint, CDORevisionAvailabilityInfo, CDOBranchPoint, CDORevisionAvailabilityInfo, Set, CDOChangeSet, CDOBranchPoint)</code>.</span></div>
+</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#MergeData-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-java.util.Set-org.eclipse.emf.cdo.common.commit.CDOChangeSet-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo-java.util.Set-org.eclipse.emf.cdo.common.commit.CDOChangeSet-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">MergeData</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;target,
+ <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</a>&nbsp;targetInfo,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;targetBase,
+ <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</a>&nbsp;targetBaseInfo,
+ <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>&gt;&nbsp;targetIDs,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</a>&nbsp;targetChanges,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
+ <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</a>&nbsp;sourceInfo,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;sourceBase,
+ <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</a>&nbsp;sourceBaseInfo,
+ <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>&gt;&nbsp;sourceIDs,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</a>&nbsp;sourceChanges,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;resultBase)</code>&nbsp;</td>
</tr>
</tbody>
</table>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSetData.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSetData.html
index 6bdda45700..d8d73b0c7c 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSetData.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSetData.html
@@ -595,6 +595,36 @@
</tr>
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CDOPushTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranch-org.eclipse.emf.cdo.transaction.CDOMerger-">merge</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;source,
+ <a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CDOTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranch-org.eclipse.emf.cdo.transaction.CDOMerger-">merge</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;source,
+ <a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</code>
+<div class="block">Merges the changes from the given source branch into this transaction and possibly considers previous merges
+ from that branch by inspecting the <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getMergeSource--"><code>merge source</code></a>
+ information of the <a href="../../../../../../../org/eclipse/emf/cdo/session/CDOSession.html#getCommitInfoManager--"><code>commit history</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CDOPushTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;sourceBase,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;targetBase,
+ <a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CDOTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;sourceBase,
+ <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;targetBase,
+ <a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</code>
+<div class="block">Merges the changes between the given source base point and the given source point into this transaction.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a></code></td>
<td class="colLast"><span class="typeNameLabel">CDOPushTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;sourceBase,
<a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</code>&nbsp;</td>
@@ -603,7 +633,9 @@
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a></code></td>
<td class="colLast"><span class="typeNameLabel">CDOTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;sourceBase,
- <a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</code>&nbsp;</td>
+ <a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</code>
+<div class="block">Merges the changes between the given source base point and the given source point into this transaction.</div>
+</td>
</tr>
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a></code></td>
@@ -613,7 +645,11 @@
<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a></code></td>
<td class="colLast"><span class="typeNameLabel">CDOTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge</a></span>(<a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
- <a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</code>&nbsp;</td>
+ <a href="../../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</code>
+<div class="block">Merges the changes from the given source point into this transaction and possibly considers previous merges
+ from that <a href="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getBranch--"><code>branch</code></a> by inspecting the <a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getMergeSource--"><code>merge source</code></a>
+ information of the <a href="../../../../../../../org/eclipse/emf/cdo/session/CDOSession.html#getCommitInfoManager--"><code>commit history</code></a>.</div>
+</td>
</tr>
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a></code></td