private MergeConflictHandler CreateMergeConflictHandler() { MergeConflictHandler mergeConflictHandler = new MergeConflictHandler(Context); if (mergeOptionsPage != null) { MergeOptionsPage.ConflictResolutionOption binaryOption = mergeOptionsPage.BinaryConflictResolution; if (binaryOption == MergeOptionsPage.ConflictResolutionOption.PROMPT) { mergeConflictHandler.PromptOnBinaryConflict = true; } else { mergeConflictHandler.BinaryConflictResolutionChoice = ToSvnAccept(binaryOption); } MergeOptionsPage.ConflictResolutionOption textOption = mergeOptionsPage.TextConflictResolution; if (textOption == MergeOptionsPage.ConflictResolutionOption.PROMPT) { mergeConflictHandler.PromptOnTextConflict = true; } else { mergeConflictHandler.TextConflictResolutionChoice = ToSvnAccept(textOption); } } return(mergeConflictHandler); }
private SvnAccept ToSvnAccept(MergeOptionsPage.ConflictResolutionOption option) { SvnAccept choice = SvnAccept.Postpone; switch (option) { case MergeOptionsPage.ConflictResolutionOption.BASE: choice = SvnAccept.Base; break; case MergeOptionsPage.ConflictResolutionOption.MINE: choice = SvnAccept.MineFull; break; case MergeOptionsPage.ConflictResolutionOption.THEIRS: choice = SvnAccept.TheirsFull; break; default: choice = SvnAccept.Postpone; break; } return(choice); }