Re: Remove conf/*.mk from svn (was: Re: Linking)

[Yoshinori K. Okuji]

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 <address@hidden> 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