JavaHg and merge prompts

[Martin Geisler]

Hi everybody,

Jan is working on JavaHg and brought up an interesting question with
regard to the command server and merge manifest prompts: how should they
be handled in command server libraries?

Currently, JavaHg operates with the a notion of a ManifestMergeOracle,
which is an "oracle" that can answer the queries made by the manifest
merge prompts:

  https://bitbucket.org/aragost/javahg/src/ea0546d3d495/src/test/java/com/aragost/javahg/commands/MergeCommandTest.java#cl-60

The idea is that the programmer examines the situation up-front and adds
answers to the oracle before calling merge. He can also run the merge
with no answers and the oracle will then record the file names for which
prompts were given. The programmer can then re-run the merge after
cleaning up.

Have you guys got any input on this? Will python-hglib handle this in a
smarter or easier way?

-- 
Martin Geisler

aragost Trifork
Professional Mercurial support
http://mercurial.aragost.com/kick-start/