From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1KMP4e-0003lV-1a for mharc-grub-devel@gnu.org; Fri, 25 Jul 2008 11:19:16 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KMP4c-0003i7-AP for grub-devel@gnu.org; Fri, 25 Jul 2008 11:19:14 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KMP4a-0003fI-HL for grub-devel@gnu.org; Fri, 25 Jul 2008 11:19:13 -0400 Received: from [199.232.76.173] (port=53775 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KMP4a-0003f9-DT for grub-devel@gnu.org; Fri, 25 Jul 2008 11:19:12 -0400 Received: from gateway10.websitewelcome.com ([67.18.103.10]:59861) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1KMP4Z-0004kv-PW for grub-devel@gnu.org; Fri, 25 Jul 2008 11:19:12 -0400 Received: (qmail 32315 invoked from network); 25 Jul 2008 15:25:29 -0000 Received: from gator297.hostgator.com (74.53.228.114) by gateway10.websitewelcome.com with SMTP; 25 Jul 2008 15:25:29 -0000 Received: from c-67-185-142-228.hsd1.wa.comcast.net ([67.185.142.228]:49675 helo=localhost) by gator297.hostgator.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.68) (envelope-from ) id 1KMP4T-0004BF-Cb for grub-devel@gnu.org; Fri, 25 Jul 2008 10:19:05 -0500 Date: Fri, 25 Jul 2008 08:18:27 -0700 From: Colin D Bennett To: grub-devel@gnu.org Message-ID: <20080725081827.42534c83@gibibit.com> In-Reply-To: <414717.45608.qm@web31604.mail.mud.yahoo.com> References: <414717.45608.qm@web31604.mail.mud.yahoo.com> X-Mailer: Claws Mail 3.5.0 (GTK+ 2.12.10; i686-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator297.hostgator.com X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - gibibit.com X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) Subject: 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: Fri, 25 Jul 2008 15:19:14 -0000 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. Regards, Colin