David Bustos wrote: > Quoth Mark J. Nelson on Fri, Feb 06, 2009 at 04:33:48PM -0700: >> I think the primary argument against allowing merge changesets in >> Mercurial is that, when SCCS merge deltas were allowed in Teamware, they >> resulted in reduced signal to noise in the metadata. I don't think, if >> merge changesets are limited to trivial/uninteresting cases, that >> concern is particularly valid. (By definition, an SCCS merge was >> interesting--it only happened with file conflicts.) > > Would arbitrary merge changesets unnecessarily confuse hg diff?
No. Mercurial diffs are always between two endpoints (rev1:rev2 or rev1:workingdir), each of which is completely specified. --Mark
