Mercurial > hg > easyhg
diff filestates.cpp @ 362:73fb5ef55744
Merge from branch "feature_91b". Really fixes #91
author | Chris Cannam |
---|---|
date | Thu, 17 Mar 2011 17:34:40 +0000 |
parents | 4cd753e083cc |
children |
line wrap: on
line diff
--- a/filestates.cpp Thu Mar 17 16:36:02 2011 +0000 +++ b/filestates.cpp Thu Mar 17 17:34:40 2011 +0000 @@ -144,11 +144,11 @@ switch (s) { case Modified: - a << Annotate << Diff << Commit << Revert << Remove; + a << Annotate << Diff << Commit << Revert << Rename << Copy << Remove; break; case Added: - a << Commit << Revert << Remove; + a << Commit << Revert << Rename << Copy << Remove; break; case Removed: @@ -168,7 +168,7 @@ break; case Clean: - a << Annotate << Remove; + a << Annotate << Rename << Copy << Remove; break; case Ignored: @@ -189,9 +189,10 @@ switch (a) { case Annotate: case Diff: return 0; case Commit: case Revert: return 1; - case Add: case Remove: return 2; - case RedoMerge: case MarkResolved: return 3; - case Ignore: case UnIgnore: return 4; + case Rename: case Copy: return 2; + case Add: case Remove: return 3; + case RedoMerge: case MarkResolved: return 4; + case Ignore: case UnIgnore: return 5; } return 0; }