From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1KMSEA-0004IP-Gp for mharc-grub-devel@gnu.org; Fri, 25 Jul 2008 14:41:18 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KMSE8-0004Hv-GQ for grub-devel@gnu.org; Fri, 25 Jul 2008 14:41:16 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KMSE3-0004H7-Da for grub-devel@gnu.org; Fri, 25 Jul 2008 14:41:15 -0400 Received: from [199.232.76.173] (port=42341 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KMSE3-0004H4-Ak for grub-devel@gnu.org; Fri, 25 Jul 2008 14:41:11 -0400 Received: from mailout09.t-online.de ([194.25.134.84]:41652) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KMSE2-00043P-VY for grub-devel@gnu.org; Fri, 25 Jul 2008 14:41:11 -0400 Received: from fwd25.aul.t-online.de by mailout09.sul.t-online.de with smtp id 1KMSE0-0003H4-04; Fri, 25 Jul 2008 20:41:08 +0200 Received: from [10.3.2.2] (TuSAawZE8hnaktJ1H1wVcieQ3RCwguyCvkwzxwOnMGzM4KiTBEMCZX7+63zM38cgVF@[217.235.233.157]) by fwd25.aul.t-online.de with esmtp id 1KMSDr-0Q9IMC0; Fri, 25 Jul 2008 20:40:59 +0200 Message-ID: <488A1E3C.7030108@t-online.de> Date: Fri, 25 Jul 2008 20:41:00 +0200 From: Christian Franke User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071128 SeaMonkey/1.1.7 MIME-Version: 1.0 To: The development of GRUB 2 References: <414717.45608.qm@web31604.mail.mud.yahoo.com> <20080725081827.42534c83@gibibit.com> In-Reply-To: <20080725081827.42534c83@gibibit.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-ID: TuSAawZE8hnaktJ1H1wVcieQ3RCwguyCvkwzxwOnMGzM4KiTBEMCZX7+63zM38cgVF X-TOI-MSGID: 11c5f05b-00c1-4c30-b237-113eaafade17 X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) Subject: Re: Remove conf/*.mk from svn 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 18:41:17 -0000 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 agree, the files generated by ./autogen.sh should be included in tarball, but not in the repo. Additional prerequisites (autoconf, ruby) for builds from svn are IMO OK. In my local grub2 git repo, these files are excluded: configure config.h.in stamp-h.in conf/*.mk BTW: autogen.sh should "touch stamp-h.in" to be consistent with the Makefile rule for config.h.in. Christian