Richard Lowe wrote: >> Gary> 8) So far, I've not had a conflict (only been doing Hg for a week), but >> Gary> merges seem to be required to happen automagically. I understand this >> Gary> is required for the convenience of the conflicting push issue I noted >> in >> Gary> 6). I'm happy to have all non-conflicting files automatically merged >> Gary> (just like when I did a bringover). I never what any of my "active" >> Gary> files to ever be merged by any tool other than my fingers using >> $EDITOR. >> >> Gary> The way I did this with TeamWare by making a copy of any files in >> Gary> conflict, running resolve and always accepting parent, then reediting >> Gary> and merging again. Finally redelget. >> >> Gary> How do I affect the same work flow in Hg+Cd? >> >> I don't know if you can. > > There is an outstanding request from someone else to adjust hgsetup(1) > such that the hgrc it creates prevents Hg attempting to automerge any > file it views as in conflict. I'm quite happy to do this, but I had > thought that there were those as vocally in favor of auto-merge as > some are against.
Assuming there's a way to manually auto-merge a conflict, I think a default of not auto-merging would be preferable. One way, you're adding a single step for people who prefer the convenience. The other way, you're making it very difficult for people who are trying to be careful. I don't like defaults that discourage careful behavior. Alternatively, would it be possible to make it an option to hgsetup? Dave
