Gentoo Archives: gentoo-scm

From: William Hubbs <williamh@g.o>
To: gentoo-scm@l.g.o
Subject: Re: [gentoo-scm] Re: [gentoo-dev] Progress on cvs->git migration
Date: Sun, 04 Sep 2011 17:07:01
Message-Id: 20110904170420.GA6165@linux1
In Reply to: Re: [gentoo-scm] Re: [gentoo-dev] Progress on cvs->git migration by Nirbheek Chauhan
On Wed, Aug 24, 2011 at 03:55:59PM +0530, Nirbheek Chauhan wrote:
> > CVS and SVN have global order, hence their ability to create changelogs > > that are always growing in a single direction. Git has no global order > > when merges are involved. If I merge in a commit made months ago, where > > is the correct place for it in the generated changelog? When the > > generated changelog is generated from scratch, where does it go? Does it > > stay in the same place after more merges? > > > > I could've sworn we had decided to disallow merge commits because of > this problem, the noise it creates, and the unnecessarily complicated > history it would create. There's no value in preserving exact history > for the portage tree.
I realize I'm pretty late on this discussion, but I also would vote for disallowing merge commits in the portage tree. William