Branching/merging in DVCS is only easy if there are no merge conflicts. Checking in code to the VCS that makes the tree NOT build will get you screamed at (at

Branching/merging in DVCS is only easy if there are no merge conflicts. Checking in code to the VCS that makes the tree NOT build will get you screamed at (at least within the OpenBSD project). This requires proper planning for big changes, and to break them down into small, easy to review, patches. OpenBSD uses CVS as main repo because it fits their development style. Bevore you knock down CVS look at AnonCVS and cvsync. http://www.openbsd.org/papers/asiabsdcon2009-release_engineering/ http://www.openbsd.org/papers/asiabsdcon2009-release_enginee...