jetbrains.buildServer.vcs

Interface MergeSupport

All Superinterfaces:

VcsExtension

public interface MergeSupport
extends VcsExtension

Support for merge operation

Method Summary

Modifier and Type	Method and Description
MergeResult	merge(VcsRoot root, java.lang.String srcRevision, java.lang.String dstBranch, java.lang.String message, MergeOptions options) Merges specified revision in given VCS root into given destination branch with specified message and options.
java.util.Map<MergeTask,MergeResult>	tryMerge(VcsRoot root, java.util.List<MergeTask> tasks, MergeOptions options) Try to merge given merge tasks with specified options and return a map of merge result for each task.

Method Detail

merge

@NotNull
MergeResult merge(@NotNull
                           VcsRoot root,
                           @NotNull
                           java.lang.String srcRevision,
                           @NotNull
                           java.lang.String dstBranch,
                           @NotNull
                           java.lang.String message,
                           @NotNull
                           MergeOptions options)
                    throws VcsException

Merges specified revision in given VCS root into given destination branch with specified message and options.

Parameters:

root - VCS root of interest

srcRevision - revision to merge

dstBranch - vcs name of destination branch

message - merge commit message to use

options - merge options

Throws:

VcsException - in the case of significant errors, should not be thrown if merge fails

tryMerge

@NotNull
java.util.Map<MergeTask,MergeResult> tryMerge(@NotNull
                                                       VcsRoot root,
                                                       @NotNull
                                                       java.util.List<MergeTask> tasks,
                                                       @NotNull
                                                       MergeOptions options)
                                                throws VcsException

Try to merge given merge tasks with specified options and return a map of merge result for each task. Result of the merge should not be published.

Parameters:

root - VCS root of interest

tasks - merge targets

options - merge options

Returns:

see above

Throws:

VcsException - in the case of significant errors, should not be thrown if merge fails