Package org.eclipse.emf.cdo.lm.util
Class CoreDeliveryMerger
java.lang.Object
org.eclipse.emf.cdo.lm.util.CoreDeliveryMerger
- All Implemented Interfaces:
LMMerger
- Since:
- 1.3
- Author:
- Eike Stepper
-
Field Summary
-
Constructor Summary
Constructors -
Method Summary
Modifier and TypeMethodDescriptionprotected CDOMergerlongmergeDelivery(CDOSession session, CDOBranchPoint sourceBranchPoint, CDOBranch targetBranch) Merges the changes from the given source branch point into the given target branch and returns the time stamp of the resulting commit into the merge target branch, orCDOBranchPoint.INVALID_DATEif no commit has happened.protected CDOTransactionopenTransaction(CDOSession session, CDOBranch branch)
-
Constructor Details
-
CoreDeliveryMerger
public CoreDeliveryMerger()
-
-
Method Details
-
mergeDelivery
public long mergeDelivery(CDOSession session, CDOBranchPoint sourceBranchPoint, CDOBranch targetBranch) Description copied from interface:LMMergerMerges the changes from the given source branch point into the given target branch and returns the time stamp of the resulting commit into the merge target branch, orCDOBranchPoint.INVALID_DATEif no commit has happened.- Specified by:
mergeDeliveryin interfaceLMMerger
-
openTransaction
-
createMerger
-