MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 06:39:38 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-134344 Incorrect conflict resolving while grafting

Browse Source 
* conflict info should be updated if only continue grafting and warn in other cases
This commit is contained in:
Nadya Zabrodina
2014-12-15 19:48:47 +03:00
parent 2fb3b9590f
commit 374641e2df
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/hg4idea/src/org/zmlx/hg4idea/cherrypick/HgCherryPicker.java
View File

@@ -46,7 +46,6 @@ public class HgCherryPicker extends VcsCherryPicker {
myProject = project;
}
@NotNull
@Override
public VcsKey getSupportedVcs() {
@@ -76,7 +75,6 @@ public class HgCherryPicker extends VcsCherryPicker {
}
}
private static void processGrafting(@NotNull HgRepository repository, @NotNull List<String> hashes) {
Project project = repository.getProject();
VirtualFile root = repository.getRoot();
@@ -87,15 +85,15 @@ public class HgCherryPicker extends VcsCherryPicker {
new HgCommandResultNotifier(project).notifyError(result, "Hg Error", "Couldn't graft.");
return;
}
final UpdatedFiles updatedFiles = UpdatedFiles.create();
while (hasConflicts) {
final UpdatedFiles updatedFiles = UpdatedFiles.create();
new HgConflictResolver(project, updatedFiles).resolve(root);
hasConflicts = !HgConflictResolver.findConflicts(project, root).isEmpty();
if (!hasConflicts) {
result = command.continueGrafting();
hasConflicts = !HgConflictResolver.findConflicts(project, root).isEmpty();
}
hasConflicts = !HgConflictResolver.findConflicts(project, root).isEmpty();
if (hasConflicts) {
else {
new HgCommandResultNotifier(project).notifyError(result, "Hg Error", "Couldn't continue grafting");
break;
}