Strategies for push/merge problem?

[Douglas Philips]

On or about 2008 Jul 14, at 6:50 PM, Alpár Jüttner indited:
> Finally, the "frequent commit" policy is probably a legacy of the
> locking model revision systems. Using mercurial, you will typically  
> find
> it much better to commit larger block of changes, and synchronizing  
> your
> repository even less frequently, for example when you more-or-less
> completely finished implementing a new feature.

I have to disagree. My experience with CVS is that it encourages bit  
commits because the alternative, making branches, is just too painful,  
so folks tend to sit on their changes until they are all done.

One of the most refreshing things about DVCSes is that you can commit  
when you've made a nice chunk of change, and committing does -not-  
mean you have to share, it is just another point where you can fall  
back to and take another task. Now, whether you use MQ or some other  
mechanism to compress all those into one fine jewel of a mega-commit  
is a different story.

--Doug