> 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.
My biggest issue with the current auto-merge logic is that there's no
record of what files it merely "updated"[1] and what files in
"conflict"[1] it managed to auto-merge (minimally, I'd like to look over
its auto-merge). This becomes increasingly difficult when your repo has
hundreds of changed files.
That said, it would be nice to tell hg to never auto-merge a file that's
in conflict.
[1] In Teamware terms, an "update" occurs if only the parent's version
of the file has changed, and a "conflict" occurs if both the parent
and child have changed the file.
--
meem
