From dd4b38854fe55f43a516a8ab9a3d59f3fe16c614 Mon Sep 17 00:00:00 2001
From: Nadya Zabrodina <Nadya.Zabrodina@jetbrains.com>
Date: Thu, 11 Jul 2013 19:18:28 +0400
Subject: [PATCH] IDEA-110365 resolve conflicts after updateTo action

---
 .../src/org/zmlx/hg4idea/action/HgBranchPopupActions.java    | 4 +++-
 .../src/org/zmlx/hg4idea/action/HgUpdateToAction.java        | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgBranchPopupActions.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgBranchPopupActions.java
index 3a981ac8d5fe..ab1bd8973c10 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgBranchPopupActions.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgBranchPopupActions.java
@@ -261,11 +261,13 @@ public class HgBranchPopupActions {
 
       @Override
       public void actionPerformed(AnActionEvent e) {
-        HgUpdateCommand hgUpdateCommand = new HgUpdateCommand(myProject, mySelectedRepository.getRoot());
+        final VirtualFile repository = mySelectedRepository.getRoot();
+        HgUpdateCommand hgUpdateCommand = new HgUpdateCommand(myProject, repository);
         hgUpdateCommand.setBranch(myBranch);
         HgCommandResult result = hgUpdateCommand.execute();
         if (HgErrorUtil.hasErrorsInCommandExecution(result)) {
           new HgCommandResultNotifier(myProject).notifyError(result, "", "Update failed");
+          new HgConflictResolver(myProject).resolve(repository);
         }
         myProject.getMessageBus().syncPublisher(HgVcs.BRANCH_TOPIC).update(myProject, null);
       }
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgUpdateToAction.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgUpdateToAction.java
index fcb02bb01854..b434df4bade4 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgUpdateToAction.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgUpdateToAction.java
@@ -25,6 +25,7 @@ import org.zmlx.hg4idea.HgVcs;
 import org.zmlx.hg4idea.HgVcsMessages;
 import org.zmlx.hg4idea.command.HgUpdateCommand;
 import org.zmlx.hg4idea.execution.HgCommandResult;
+import org.zmlx.hg4idea.provider.update.HgConflictResolver;
 import org.zmlx.hg4idea.ui.HgUpdateToDialog;
 import org.zmlx.hg4idea.util.HgBranchesAndTags;
 import org.zmlx.hg4idea.util.HgErrorUtil;
@@ -66,7 +67,8 @@ public class HgUpdateToAction extends HgAbstractGlobalAction {
   }
 
   public void updateTo(HgUpdateToDialog dialog, final Project project) {
-    final HgUpdateCommand command = new HgUpdateCommand(project, dialog.getRepository());
+    final VirtualFile repository = dialog.getRepository();
+    final HgUpdateCommand command = new HgUpdateCommand(project, repository);
     command.setClean(dialog.isRemoveLocalChanges());
     if (dialog.isRevisionSelected()) {
       command.setRevision(dialog.getRevision());
@@ -81,6 +83,7 @@ public class HgUpdateToAction extends HgAbstractGlobalAction {
       @Override
       public void run() {
         HgCommandResult result = command.execute();
+        new HgConflictResolver(project).resolve(repository);
         if (HgErrorUtil.hasErrorsInCommandExecution(result)) {
           new HgCommandResultNotifier(project).notifyError(result, "", "Update failed");
         }