Mercurial > hg > easyhg
log filestates.cpp @ 163:5c262ac73948
age | author | description |
---|---|---|
Fri, 03 Dec 2010 19:35:04 +0000 | Chris Cannam | * First cut of work on merge/resolve logic |
Fri, 03 Dec 2010 12:29:57 +0000 | Chris Cannam | * Add InConflict state (not yet used) |
Fri, 26 Nov 2010 12:48:29 +0000 | Chris Cannam | * Add a queueing mechanism for Hg actions, instead of refusing to start an action if something else is already happening. This is essential now that actions can be prompted by asynchronous events (e.g. filesystem watcher). |