Peter Memishian writes: > I was still fuming about this experience at lunch when Jonathan Adams > raised an alternative: given that the above is entirely mechanical, why > can't the gate do it for us? That is, why cant the hg push logic see that > there are other changesets but that none of them have conflicting files, > and do the above dance for the developer?
That'd be nice. I think it's really a work-style issue with Mercurial, and it'd be nice if Mercurial could itself do something to support the "changesets with non-overlapping sets of files don't actually require merge" model, but it's so far afield of the way Mercurial is designed that it seems doubtful, and we'll probably have to hack around it ourselves. The big underlying model change would be to allow changesets themselves to "float" within a sequence as long as overlaps aren't present. In other words, changing from a strict linear model as used now to a DAG with edges representing ordering due to overlap. -- James Carlson, Solaris Networking <james.d.carlson at sun.com> Sun Microsystems / 35 Network Drive 71.232W Vox +1 781 442 2084 MS UBUR02-212 / Burlington MA 01803-2757 42.496N Fax +1 781 442 1677
