Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-22 20:11:38 +01:00
Code Issues Packages Projects Releases Activity

Add conflict type

Browse Source
This commit is contained in:
Rene Pfeuffer
2019-11-14 15:07:49 +01:00
parent 47da287178
commit ff1abf2c1c
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scm-core/src/main/java/sonia/scm/repository/spi/MergeConflictResult.java
View File

@@ -4,6 +4,7 @@ import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import static sonia.scm.repository.spi.MergeConflictResult.ConflictTypes.ADDED_BY_BOTH;
import static sonia.scm.repository.spi.MergeConflictResult.ConflictTypes.BOTH_MODIFIED;
import static sonia.scm.repository.spi.MergeConflictResult.ConflictTypes.DELETED_BY_THEM;
import static sonia.scm.repository.spi.MergeConflictResult.ConflictTypes.DELETED_BY_US;
@@ -28,6 +29,10 @@ public class MergeConflictResult {
conflicts.add(new SingleMergeConflict(DELETED_BY_US, path, null));
}
public void addAddedByBoth(String path) {
conflicts.add(new SingleMergeConflict(ADDED_BY_BOTH, path, null));
}
public static class SingleMergeConflict {
private final ConflictTypes type;
private final String path;
@@ -53,6 +58,6 @@ public class MergeConflictResult {
}
public enum ConflictTypes {
BOTH_MODIFIED, DELETED_BY_THEM, DELETED_BY_US
BOTH_MODIFIED, DELETED_BY_THEM, DELETED_BY_US, ADDED_BY_BOTH
}
}

3
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
View File

@@ -142,6 +142,9 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
throw new InternalRepositoryException(repository, "could not calculate diff for path " + path, e);
}
break;
case BOTH_ADDED:
result.addAddedByBoth(path);
break;
case DELETED_BY_THEM:
result.addDeletedByThem(path);
break;