Mercurial Repositories > eric / file comparison
comparison: VCS/StatusMonitorThread.py
VCS/StatusMonitorThread.py
- changeset 110
- c9a969db1469
- parent 97
- c4086afea02b
- child 216
- 6f9713e8d570
equal
deleted
inserted
replaced
| 109:9c72858d4b7a | 110:c9a969db1469 |
|---|---|
| 180 <li>"Z" path contains a conflict</li> | 180 <li>"Z" path contains a conflict</li> |
| 181 <li>" " path is back at normal</li> | 181 <li>" " path is back at normal</li> |
| 182 </ul> | 182 </ul> |
| 183 | 183 |
| 184 @return tuple of flag indicating successful operation (boolean) and | 184 @return tuple of flag indicating successful operation (boolean) and |
| 185 a status message in case of non successful operation (QString) | 185 a status message in case of non successful operation (string) |
| 186 """ | 186 """ |
| 187 raise RuntimeError('Not implemented') | 187 raise RuntimeError('Not implemented') |
