Package sonia.scm.repository.spi

Interface MergeCommand

public interface MergeCommand

Method Summary

Modifier and Type	Method	Description
MergeConflictResult	computeConflicts(MergeCommandRequest request)
MergeDryRunCommandResult	dryRun(MergeCommandRequest request)
Set<MergeStrategy>	getSupportedMergeStrategies()
boolean	isSupported(MergeStrategy strategy)
MergeCommandResult	merge(MergeCommandRequest request)	Executes the merge.

Method Details

merge

MergeCommandResult merge(MergeCommandRequest request)

Executes the merge.

Parameters:

request - The parameters specifying the merge.

Returns:

Result holding either the new revision or a list of conflicting files.

Throws:

NoChangesMadeException - If the merge neither had a conflict nor made any change.

dryRun

MergeDryRunCommandResult dryRun(MergeCommandRequest request)

computeConflicts

MergeConflictResult computeConflicts(MergeCommandRequest request)

isSupported

boolean isSupported(MergeStrategy strategy)

getSupportedMergeStrategies

Set<MergeStrategy> getSupportedMergeStrategies()