Merge on push?

[Greg Lindahl]

On Tue, Jun 10, 2008 at 11:36:43PM -0400, Douglas Philips wrote:
> On 2008 Jun 9, at 11:15 PM, Greg Lindahl wrote:
> > Why on earth would you vote on someone else's policy?
> 
> Because I wasn't?
> 
> I wasn't talking about policy, I was talking about the fundamental  
> difference in philosophy between CVS and Mercurial (and most other  
> DVCs).

Ah. Then you're talking past the people you think you're talking to.

> In CVS there is absolutely no notion of a changeset. Any such notion  
> is a social convention or policy artifact of commits with common/ 
> exactly-the-same commit strings, and/or post-facto tags and/or some  
> external-to-CVS mechanism.

Uh, I don't see what that has with the discussion. I thought the
discussion was about how sites that want a "central repo" deal with
checkins and merging, in particular the case where merges can be
automatically done (and perhaps incorrect). This is a common way
Mercurial is used, and I thought that was what "CVSesque" was
referring to.

-- greg