I'd very much like for hgr (http://bugs.grommit.com/show_bug.cgi?id=309) to block a commit that would contain an incomplete merge.
The easiest way to do this is to have cdm insert a hook to prevent it (where cdm both implements the hook, and pushes it into the config at runtime). This is also how we intended the client-side correctness checks to be implemented. This, of course, means that functionality is only present when cdm is loaded. Can we rely on this? It seems more likely, to me, that any user who isn't loading cdm in ~/.hgrc would load it per-workspace, than load it and mirriad other hooks. The alternative is finding some other mechanism to force the hook into place as appropriate, which would probably involve hgr adjusting $CODEMGR_WS/.hg/hgrc itself, I would prefer to avoid this. -- Rich
