public interface MergingVcsWorkingCopyManager extends VcsWorkingCopyManager
VcsWorkingCopyManager
that can do merges.Modifier and Type | Method and Description |
---|---|
default boolean |
canDoMerge()
Deprecated.
since 7.1 without replacement. Should be always true.
|
@NotNull VcsWorkingCopy |
checkoutAndMerge(@NotNull CommonContext commonContext,
@NotNull VcsRepositoryData vcsRepositoryData,
@NotNull VcsBranch targetBranch,
@NotNull PlanVcsRevisionData revisionOnTarget,
@NotNull VcsBranch sourceBranch,
@NotNull PlanVcsRevisionData sourceRevision,
@NotNull File targetPath)
Checks out the targetBranch and merges sourceBranch to it.
|
default @NotNull Set<Requirement> |
getMergingRequirements()
Deprecated.
since 7.1 without replacement, it's not used anywhere
|
retrieveSourceCode, updateToLatestRevision
@Deprecated default boolean canDoMerge()
@NotNull @Deprecated default @NotNull Set<Requirement> getMergingRequirements()
VcsExecutorWithRequirements#getRequirements()
, return them here.@NotNull @NotNull VcsWorkingCopy checkoutAndMerge(@NotNull @NotNull CommonContext commonContext, @NotNull @NotNull VcsRepositoryData vcsRepositoryData, @NotNull @NotNull VcsBranch targetBranch, @NotNull @NotNull PlanVcsRevisionData revisionOnTarget, @NotNull @NotNull VcsBranch sourceBranch, @NotNull @NotNull PlanVcsRevisionData sourceRevision, @NotNull @NotNull File targetPath) throws RepositoryException
vcsRepositoryData
- configuration of the repository. Note that the following parameters override branch stored in repository data.targetBranch
- - target branch (branch to checkout and merge to)revisionOnTarget
- - revision to checkout and merge tosourceBranch
- - branch to merge fromsourceRevision
- - revision to merge fromtargetPath
- - workings copy's pathRepositoryException
Copyright © 2022 Atlassian Software Systems Pty Ltd. All rights reserved.