Mercurial > hg > easyhg

diff src/hgtabwidget.h @ 505:1c05e7576ea5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix bug #292: "Merge that results in no changes leaves interface in inconsistent state." Show uncommitted state whenever a merge is present, even if no file changes
author Chris Cannam
date Mon, 17 Oct 2011 16:25:02 +0100
parents 896b7903e8f2
children 470829a21f98
line wrap: on
line diff
--- a/src/hgtabwidget.h	Thu Sep 15 14:51:39 2011 +0100
+++ b/src/hgtabwidget.h	Mon Oct 17 16:25:02 2011 +0100
@@ -49,6 +49,8 @@
 
     void setCurrent(QStringList ids, QString branch);
 
+    void setHaveMerge(bool);
+
     void updateFileStates();
     void updateHistory();
 
@@ -113,6 +115,7 @@
     FileStatusWidget *m_fileStatusWidget;
     HistoryWidget *m_historyWidget;
     FileStates m_fileStates;
+    bool m_haveMerge;
 
     Changesets parseChangeSets(QString changeSetsStr);
 };