Merge on push?

Douglas Philips dgou at mac.com
Mon Jun 16 08:40:32 CDT 2008


On 2008 Jun 16, at 4:22 AM, Adrian Buehlmann wrote:
> Did you try Bazaar's centralized workflow?
>
> http://bazaar-vcs.org/Workflows#head-22b1dac636e54e501e9b5a0a235f21bb686b80ac
>
> Quote:
> '''
> Subversion and CVS are good choices for implementing this workflow  
> because
> they make it easy. Unlike the vast majority of distributed VCS  
> tools, Bazaar
> makes it easy as well by directly supporting it. In addition, Bazaar  
> provides
> some important advantages over CVS and Subversion:
>
>    * much better branching and merging
>    * better renaming support.
> '''

That is pretty durn funny. The part you didn't quote:
'''
They run "bzr update" to get their checkout up-to-date, then "bzr  
commit" to commit.
'''

Notice that bzr doesn't magically do that for you...
Those are the exact steps (pulling before pushing) that this thread  
has been trying to find a way to avoid.

Despite protestations to the contrary that "it can be done", none of  
the DVCS's have the features/flaws of CVS/Subversion (individual file  
versioning) that will allow push without pull the way CVS/Subversion do.

--Doug



More information about the Mercurial mailing list