Mercurial > hg > easyhg

comparison filestates.cpp @ 328:ea62eb083ed4 filelist_right_button_menu

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge fixes: primarily, handle failed merges better
author Chris Cannam
date Fri, 11 Mar 2011 18:08:22 +0000
parents 6e1fdda1dff2
children 4cd753e083cc
comparison
equal deleted inserted replaced
327:f166f70c64f9 328:ea62eb083ed4
154 case Removed: 154 case Removed:
155 a << Commit << Revert << Add; 155 a << Commit << Revert << Add;
156 break; 156 break;
157 157
158 case InConflict: 158 case InConflict:
159 a << Annotate << Diff << RedoMerge << Revert << MarkResolved; 159 a << Annotate << Diff << RedoMerge << MarkResolved << Revert;
160 break; 160 break;
161 161
162 case Missing: 162 case Missing:
163 a << Revert << Remove; 163 a << Revert << Remove;
164 break; 164 break;
166 case Unknown: 166 case Unknown:
167 a << Add << Ignore; 167 a << Add << Ignore;
168 break; 168 break;
169 169
170 case Clean: 170 case Clean:
171 a << Remove << Annotate; 171 a << Annotate << Remove;
172 break; 172 break;
173 173
174 case Ignored: 174 case Ignored:
175 a << UnIgnore; 175 a << UnIgnore;
176 break; 176 break;