Package org.eclipse.emf.cdo.lm.util
Interface LMMerger2
- All Superinterfaces:
LMMerger
- Since:
- 1.2
- Author:
- Eike Stepper
-
Nested Class Summary
Nested Classes -
Field Summary
-
Method Summary
Modifier and TypeMethodDescriptionlongMerges the changes indicated by the givenmerge infosand returns the time stamp of the resulting commit into the merge target branch, orCDOBranchPoint.INVALID_DATEif no commit has happened.default longmergeDelivery(CDOSession session, CDOBranchPoint sourceBranchPoint, CDOBranch targetBranch) Deprecated.
-
Method Details
-
mergeDelivery
Merges the changes indicated by the givenmerge infosand returns the time stamp of the resulting commit into the merge target branch, orCDOBranchPoint.INVALID_DATEif no commit has happened. -
mergeDelivery
@Deprecated default long mergeDelivery(CDOSession session, CDOBranchPoint sourceBranchPoint, CDOBranch targetBranch) Deprecated.As of 1.2 implementmergeDelivery(LMMergeInfos).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
-
mergeDelivery(LMMergeInfos).