Some questions concerning daily use

[Martin Geisler]

"Murr, Florian" <florian.murr at siemens.com> writes:

> 3. Mercurial seems to define a "conflict" to happen when "the same
>    line in the same file" has been changed.

This is the standard way to define a conflict by all revision control
systems I know.

>    For me there is a "confict" whenever "the same file" has been
>    changed.
>    [I want to have all merging of files carefully monitored by me and
>    not let it happen automatically! If there is done anything
>    automatically, I want at least to know exactly which files are
>    concerned, to be able to undo any unreasonable machine-decisions.]

Try looking at this page:

  http://www.selenic.com/mercurial/wiki/index.cgi/MergeToolConfiguration

especially the 'premerge' option which I think will do what you want,
e.g., disable the automatic merge.

-- 
Martin Geisler

VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multi-Party Computation) to Python. See: http://viff.dk/.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20081008/054004b9/attachment-0001.asc>