From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1KOebR-0000pb-U2 for mharc-grub-devel@gnu.org; Thu, 31 Jul 2008 16:18:25 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KOebP-0000pV-Ll for grub-devel@gnu.org; Thu, 31 Jul 2008 16:18:23 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KOebM-0000pJ-Kb for grub-devel@gnu.org; Thu, 31 Jul 2008 16:18:23 -0400 Received: from [199.232.76.173] (port=50846 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KOebM-0000pG-FR for grub-devel@gnu.org; Thu, 31 Jul 2008 16:18:20 -0400 Received: from ns39764.ovh.net ([91.121.25.85]:52527 helo=nexedi.com) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KOebM-0000Bw-HP for grub-devel@gnu.org; Thu, 31 Jul 2008 16:18:20 -0400 Received: from [10.8.0.46] (unknown [10.8.0.46]) by nexedi.com (Postfix) with ESMTP id 068473DB97 for ; Thu, 31 Jul 2008 22:29:41 +0200 (CEST) From: "Yoshinori K. Okuji" Organization: enbug.org To: The development of GRUB 2 Date: Thu, 31 Jul 2008 22:18:13 +0200 User-Agent: KMail/1.9.9 References: <414717.45608.qm@web31604.mail.mud.yahoo.com> <20080725081827.42534c83@gibibit.com> <20080725204310.GF18149@thorin> In-Reply-To: <20080725204310.GF18149@thorin> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200807312218.14624.okuji@enbug.org> X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) Subject: Re: Remove conf/*.mk from svn (was: Re: Linking) X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jul 2008 20:18:24 -0000 On Friday 25 July 2008 22:43:10 Robert Millan wrote: > On Fri, Jul 25, 2008 at 08:18:27AM -0700, Colin D Bennett wrote: > > On Thu, 24 Jul 2008 22:17:06 -0700 (PDT) > > > > Viswesh S wrote: > > > I have modified the conf/common.mk accordingly as shown below. > > > > GRUB developers, > > > > I think we should remove conf/*.mk from the Subversion repository. If > > people are going to be developing on GRUB and checking out svn > > branches, then I think it's fine to require them to have Ruby. For > > released tarballs that we expect non-developers to use, we just need to > > generate the *.mk files and include them in the tarball. > > > > What is the benefit of having conf/*.mk files in svn? They cause lots > > of merge conflicts: sure, the conflicts are easy to resolve by simply > > choosing to take one of the revisions, but then that merge really has > > not meaning, since it won't be in sync with your .rmk file until it's > > once again regenerated and checked in. > > > > Removing the autogenerated .mk files would also eliminate problems new > > developers like Viswesh and I have encountered -- we won't be tempted > > to modify a non-versioned file like this. > > I'd check with Okuji first. IIRC he didn't like that idea. I don't like. You can check the archive for my comments on this. Regards, Okuji