Package org.eclipse.emf.cdo.lm.util
Schnittstelle LMMerger2
- Alle Superschnittstellen:
LMMerger
Merges the commits of a source
change
into the branch
of a target stream
in order to create a delivery
.
Note: The mergeDelivery(LMMergeInfos)
method allows to augment the merge parameters in the future without breaking APIs.
- Seit:
- 1.2
- Autor:
- Eike Stepper
-
Verschachtelte Klassen - Übersicht
Verschachtelte KlassenModifizierer und TypSchnittstelleBeschreibungstatic final class
Encapsulates themerge
parameters. -
Feldübersicht
-
Methodenübersicht
Modifizierer und TypMethodeBeschreibunglong
Merges the changes indicated by the givenmerge infos
and returns the time stamp of the resulting commit into the merge target branch, orCDOBranchPoint.INVALID_DATE
if no commit has happened.default long
mergeDelivery
(CDOSession session, CDOBranchPoint sourceBranchPoint, CDOBranch targetBranch) Veraltet.
-
Methodendetails
-
mergeDelivery
Merges the changes indicated by the givenmerge infos
and returns the time stamp of the resulting commit into the merge target branch, orCDOBranchPoint.INVALID_DATE
if no commit has happened. -
mergeDelivery
@Deprecated default long mergeDelivery(CDOSession session, CDOBranchPoint sourceBranchPoint, CDOBranch targetBranch) Veraltet.As of 1.2 implementmergeDelivery(LMMergeInfos)
.Beschreibung aus Schnittstelle kopiert:LMMerger
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_DATE
if no commit has happened.- Angegeben von:
mergeDelivery
in SchnittstelleLMMerger
-
mergeDelivery(LMMergeInfos)
.