Atomic merge?

[Dave Mateer]

We are evaluating the use of Mercurial for version-control of Xml files
for an application. Some of the Xml files need to be treated atomically.
It cannot be possible for user A's revision 5 of File1.xml to be merged
into user B's repository without user A's revision 5 of File2.xml, if
that makes any sense.

 

Naturally, commits are atomic in Mercurial. But in the case of a
conflict in File1.xml at the point of a merge, it appears that File2.xml
will still update. Is there a way to make merges atomic so that the
entire revision (all files) either succeeds or fails together?

 

Thanks,

 

Dave

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20090528/e9d1cad6/attachment.htm