blob: 8cd96f1e07dc0f62c8c2ab75ba8969134c0847a0 [file] [log] [blame]
/*
* Copyright 2000-2010 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.idea.svn.integrate;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.util.Consumer;
import org.jetbrains.annotations.Nullable;
import org.tmatesoft.svn.core.SVNException;
import java.io.File;
public interface IMerger {
boolean hasNext();
void mergeNext() throws SVNException, VcsException;
void getInfo(Consumer<String> holder, boolean getLatest);
void getSkipped(final Consumer<String> holder);
String getComment();
@Nullable
File getMergeInfoHolder();
void afterProcessing();
}