In sort, there is a slight problem with a server side check to prevent users from pushing in unresolved merge conflicts. The problem materializes such that one can checkin such conflicts, but then not (easily) remove them, again. Having you .hgrc up to date as "requested", in particular the whitespace hook [hooks] pretxncommit.whitespace = python:/check_whitespace.py:hook prevent the checkin of unresolved unresolved merge conflicts (already) on the client side. (We'll fully fix the server side once Sjoerd is back from vacation.) Stefan ----- Original Message -----

Hi stefan,

can you please share some more information about the problem? how can configurations of local files on the client side affect the server/main repository? I am asking for purely academic reasons. Is there some kind of security problem in hg?

----- Original Message -----

...

Dear all,

the MonetDB Mercurial (HG) repository should be working, again.

IMPORTANT NOTE:

To prevent further problems, it is mandatory that you do consciously read http://www.monetdb.org/Assets/MonetDB-Mercurial.html and follow all instructions carefully.

In particular, your .hgrc must contain all of the "Important Configuration" mention in above document.

You must double-check your .hgrc before your next hg pull, hg commit or hg push, which ever comes first.

Thanks! Stefan

----- Original Message -----

...

Dear all,

there seems to be a problem with the MonetDB HG (Mercurial) repository. Please refrain from pushing to it until we have sorted-out the problem.

Thanks! Stefan

-- | Stefan.Manegold@CWI.nl | DB Architectures (DA) | | www.CWI.nl/~manegold/ | Science Park 123 (L321) | | +31 (0)20 592-4212 | 1098 XG Amsterdam (NL) |

-- | Stefan.Manegold@CWI.nl | DB Architectures (DA) | | www.CWI.nl/~manegold/ | Science Park 123 (L321) | | +31 (0)20 592-4212 | 1098 XG Amsterdam (NL) |