Quite a while ago, now, we'd all decided that incremental merges were an absolute necessity (incremental in the "able to stop and start" sense, not multi-commit).
Hg has imerge, we have hgr. There was an old thread regarding whether hgr could do enough to prevent absolute mismerge (ie, no merge), but it petered out. Last I tried, imerge shared that problem (the fact it allowed you to merge and commit without actually having resolved anything). If incremental merge is a necessity, we need to resolve one or both of those problems. The hgr conversation ended with me adding a hook to cdm to look for hgr metadata and fail a commit if it was still present, the only real response I got (that I recall) was that that wasn't enough. I haven't looked into whether a similar hook could be pushed into place for imerge (through cdm), or whether imerge itself now prevents such a bogus merge (or whether it would want to). What do we want to do, who wants to do it? -- Rich
