Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 28 Dec 2011 14:09:10 -0800
From:      Doug Barton <dougb@FreeBSD.org>
To:        =?ISO-8859-1?Q?Ulrich_Sp=F6rlein?= <uqs@spoerlein.net>,  Xin LI <delphij@FreeBSD.org>, src-committers@FreeBSD.org, svn-src-all@FreeBSD.org,  svn-src-head@FreeBSD.org
Subject:   Re: svn commit: r228896 - head/contrib/netcat
Message-ID:  <4EFB9386.8060909@FreeBSD.org>
In-Reply-To: <20111228154049.GD83814@acme.spoerlein.net>
References:  <201112260907.pBQ979X4098221@svn.freebsd.org> <4EF83AF4.9010108@FreeBSD.org> <20111228154049.GD83814@acme.spoerlein.net>

next in thread | previous in thread | raw e-mail | index | archive | help
On 12/28/2011 07:40, Ulrich Spörlein wrote:
> On Mon, 2011-12-26 at 01:14:28 -0800, Doug Barton wrote:
>> On 12/26/2011 01:07, Xin LI wrote:
>>> Author: delphij
>>> Date: Mon Dec 26 09:07:08 2011
>>> New Revision: 228896
>>> URL: http://svn.freebsd.org/changeset/base/228896
>>>
>>> Log:
>>>   Merge from OpenBSD 5.0 (this is a dummy change, the vendor change does not
>>>   apply to us).
>>
>> When I'm importing stat(1) stuff from Net/OpenBSD I don't do this. I
>> will however comment in the commit log for the next substantive change,
>> "Skipped update N.NN because the change was not relevant to us," or
>> words to that effect.
>>
>> I'm not suggesting that my way of doing this is perfect, or cannot be
>> improved. I would suggest however that this change was needless churn.
> 
> I think it was the right thing to do. It's better to have one person
> (Xin LI) figure out if the change is needed or a no-op and do the
> upgrade to match our version to upstream's version, than to have a
> discrepancy between the two and cause half a dozen developers that
> stumble upon that difference to scratch their heads and spend time in
> figuring out if we should import the change.

Fair enough. Having thought more about this my only remaining concern is
that by slipping the tag we're misrepresenting the status quo since
what's in our tree is not really that version of the file. Perhaps a
comment to the effect of "purposely skipping version 1.23 because ..."
would be better?


Doug

-- 

	You can observe a lot just by watching.	-- Yogi Berra

	Breadth of IT experience, and depth of knowledge in the DNS.
	Yours for the right price.  :)  http://SupersetSolutions.com/




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4EFB9386.8060909>