[scm-migration-dev] Incremental merge

2008-03-20 Thread Mike Kupfer
Rich> What do we want to do, who wants to do it? I don't know that we have enough information to make a decision. As for the "who", I'm interested in this area, but I don't know when I would get to it. Rich> The hgr conversation ended with me adding a hook to cdm to look for Rich> hgr metadata a

[scm-migration-dev] Incremental merge

2008-03-18 Thread Richard Lowe
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 merg