Re: PR/48126 CVS commit: pkgsrc/mk/gnu-config

[David Holland <dholland-pbugs%netbsd.org@localhost>]

The following reply was made to PR pkg/48126; it has been noted by GNATS.

From: David Holland <dholland-pbugs%netbsd.org@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: PR/48126 CVS commit: pkgsrc/mk/gnu-config
Date: Mon, 16 Feb 2015 16:31:25 +0000

 On Mon, Feb 16, 2015 at 11:00:01AM +0000, Joerg Sonnenberger wrote:
  >  On Mon, Feb 16, 2015 at 02:20:00AM +0000, Alistair Crooks wrote:
  >  >  > Please revert this and get upstream to inclue this first. We should not
  >  >  > have any local modifications in this file.
  >  >  
  >  >  Actually, the reason we included these files in pkgsrc/mk is precisely
  >  >  so that we could make changes locally, without having to worry about
  >  >  upstream making the changesiin a timely manner for us.  Case in point
  >  >  was NetBSD/sh5 at the time, I believe.
  >  >  
  >  >  I don't see why we should rely on upstream for a pristine copy of
  >  >  this, as long as the changes themselves are sent upstream.
  >  
  >  It's a huge pain to diff the files on updates, so "ensure upstream has
  >  it" is by far the easiest approach to ensure that the next update will
  >  have the changes.
 
 How is it different from any other merge?
 
 -- 
 David A. Holland
 dholland%netbsd.org@localhost