Mercurial > hg > easyhg

diff filestates.h @ 163:5c262ac73948

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* First cut of work on merge/resolve logic
author Chris Cannam
date Fri, 03 Dec 2010 19:35:04 +0000
parents 5b2046f67a56
children f16fe0db11f3
line wrap: on
line diff
--- a/filestates.h	Fri Dec 03 14:43:32 2010 +0000
+++ b/filestates.h	Fri Dec 03 19:35:04 2010 +0000
@@ -29,16 +29,19 @@
 
     enum State {
 
-        Clean,
+        // These are in the order in which they want to be listed in
+        // the interface
+
         Modified,
         Added,
+        Removed,
+        InConflict,
+        Missing,
+        Clean,
         Unknown,
-        Removed,
-        Missing,
-        InConflict,
 
-        FirstState = Clean,
-        LastState = InConflict
+        FirstState = Modified,
+        LastState = Unknown
     };
 
     void parseStates(QString text);