Strategies for push/merge problem?

Chuck.Kirschman at bentley.com Chuck.Kirschman at bentley.com
Wed Jul 30 07:29:57 CDT 2008


 

>-----Original Message-----
>From: mercurial-bounces at selenic.com 
>[mailto:mercurial-bounces at selenic.com] On Behalf Of Douglas Philips
>Sent: Tuesday, July 29, 2008 7:06 PM
>To: Mercurial Users
>Subject: Re: Strategies for push/merge problem?
>
>On or about 2008 Jul 29, at 5:56 PM, Chuck.Kirschman indited:
>> reject them in case of conflict.  And in that case, we may as well  
>> have
>> Hg support a push model where if your changes do not conflict it does
>> the merge automatically.  So I agree with the corporate crowd that  
>> this
>> is the right way to go.
>
>
>If you think the SVN model is the right one, what is the point of  
>picking a tool (Hg) that has made a fundamentally different decision  
>about how source control works and then asking them to undo that  
>decision? Bored with your perfect workflow? :)
>
>	--Doug
>
>


If you think a merging policy is the only difference between Hg and SVN,
you haven't used at least one of them.  There are a lot of things to
like in a DRCS.  Sharing among individuals and ad hoc teams without
committing to the central repository.  Offline commits and repository
commands.  Fast clones for small projects.  The ability to pull is
important.  And like most of you we think Hg is the best DRCS for our
needs.  But there is no reason to dismiss a feature that would help a
lot of users.  There is already push -f, which for us is much more
harmful than having it do trivial merges.  There is already fetch, which
is designed to do these trivial merges, so there is obviously a need.
And in the year or so that I've been on this list, I have never seen any
topic that has so much support getting constant out-of-hand rejection.
It reminds me of when we first went from PVCS to CVS; all the purists
kept saying that there is no way that optimistic locking could possibly
work.  Now they can't live without it.  Maybe you wouldn't use the
feature, but then you probably don't use push at all.  

chuck



More information about the Mercurial mailing list