Slime project considering Mercurial

Jesse Glick jesse.glick at sun.com
Mon Mar 10 11:09:00 CDT 2008


>> one of the things the ClearCase enforces is that when you commit a
>> change to the repository:
>> 
>> 1) It must be the HEAD/tip of the branch. If it is not, then you
>> need to merge your changes to the HEAD/tip, resolve any conflicts
>> and then commit

Giorgos Keramidas wrote:
> You can enforce a 'linear' history like this with Mercurial too.

In fact to satisfy the above, everyone can just use 'hg fetch' before 
pushing; you simply need to ensure that developers do not use push -f to 
try to evade the need to merge their changes with remote, which can be 
done by

> enforc[ing] a single "head" in each branch.  You can make the
> repository accessible only through SSH

(or HTTPS)

> and install a commit hook which aborts changesets which create more
> "heads"

such as

http://hg.netbeans.org/nb-hooks/file/97b64e9b24e6/forbid_2head.py



More information about the Mercurial mailing list