Exemplo n.º 1
0
  private void merge(@NotNull List<SvnChangeList> changeLists) {
    if (!changeLists.isEmpty()) {
      ChangeListsMergerFactory mergerFactory =
          new ChangeListsMergerFactory(changeLists, false, false, true);

      merge(myMergeContext.getTitle(), mergerFactory, changeLists);
    }
  }
Exemplo n.º 2
0
 @Override
 public void showErrors() {
   if (!myExceptions.isEmpty()) {
     myInteraction.showErrors(myMergeContext.getTitle(), myExceptions);
   }
 }
Exemplo n.º 3
0
 public QuickMerge(
     @NotNull MergeContext mergeContext, @NotNull QuickMergeInteraction interaction) {
   super(mergeContext.getProject(), mergeContext.getTitle());
   myMergeContext = mergeContext;
   myInteraction = interaction;
 }