Mercurial > hg > easyhg

changeset 603:10ef94e51f44

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make sure we update the view after a failed merge
author Chris Cannam
date Tue, 03 Jul 2012 10:08:44 +0100
parents 92929d26b8db
children 98f57888d893
files src/fswatcher.cpp src/mainwindow.cpp
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/fswatcher.cpp	Tue Jul 03 10:02:22 2012 +0100
+++ b/src/fswatcher.cpp	Tue Jul 03 10:08:44 2012 +0100
@@ -28,7 +28,7 @@
 
 #include <deque>
 
-#define DEBUG_FSWATCHER 1
+//#define DEBUG_FSWATCHER 1
 
 /*
  * Watching the filesystem is trickier than it seems at first glance.
--- a/src/mainwindow.cpp	Tue Jul 03 10:02:22 2012 +0100
+++ b/src/mainwindow.cpp	Tue Jul 03 10:08:44 2012 +0100
@@ -2133,6 +2133,7 @@
              tr("Some files were not merged successfully.<p>You can Merge again to repeat the interactive merge; use Revert to abandon the merge entirely; or edit the files that are in conflict in an editor and, when you are happy with them, choose Mark Resolved in each file's right-button menu."),
              stdErr);
         m_mergeCommitComment = "";
+        hgQueryPaths();
         return;
     case ACT_STAT:
         break; // go on to default report