diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRevisionsCommand.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRevisionsCommand.java
index 640076735b6c..7820bc98ff35 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRevisionsCommand.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRevisionsCommand.java
@@ -162,7 +162,11 @@ abstract class HgRevisionsCommand {
                 Iterator<String> keys = copies.keySet().iterator();
                 while (keys.hasNext()) {
                   String s = keys.next();
-                  if (!filesDeleted.contains(s)) {
+                  if (filesAdded.contains(copies.get(s)) && filesDeleted.contains(s)) {
+                    filesAdded.remove(copies.get(s));
+                    filesDeleted.remove(s);
+                  }
+                  else if (!filesDeleted.contains(s)) {
                     keys.remove();
                   }
                 }
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCachingCommitedChangesProvider.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCachingCommitedChangesProvider.java
index 8a4ea7aab17d..3662b788ac17 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCachingCommitedChangesProvider.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCachingCommitedChangesProvider.java
@@ -190,7 +190,7 @@ public class HgCachingCommitedChangesProvider implements CachingCommittedChanges
     HgLogCommand hgLogCommand = new HgLogCommand(project);
     hgLogCommand.setLogFile(false);
     List<HgFileRevision> localRevisions =
-      hgLogCommand.execute(hgFile, maxCount == 0 ? -1 : maxCount, true, Collections.singletonList("--debug")); //can be empty
+      hgLogCommand.execute(hgFile, maxCount == 0 ? -1 : maxCount, true); //can be empty
 
     Collections.reverse(localRevisions);
 
@@ -285,7 +285,7 @@ public class HgCachingCommitedChangesProvider implements CachingCommittedChanges
     HgLogCommand hgLogCommand = new HgLogCommand(project);
     hgLogCommand.setLogFile(false);
     List<String> args = new ArrayList<String>();
-    args.add("--debug");
+    args.add("--follow");
     args.add("--rev");
     args.add(revision);
     HgFileRevision localRevision = hgLogCommand.execute(hgFile, 1, true, args).get(0);