From owner-freebsd-hackers Tue Jun 24 20:27:34 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id UAA26922 for hackers-outgoing; Tue, 24 Jun 1997 20:27:34 -0700 (PDT) Received: from genesis.atrad.adelaide.edu.au (genesis.atrad.adelaide.edu.au [129.127.96.120]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id UAA26917 for ; Tue, 24 Jun 1997 20:27:31 -0700 (PDT) Received: (from msmith@localhost) by genesis.atrad.adelaide.edu.au (8.8.5/8.7.3) id MAA28115 for hackers@freebsd.org; Wed, 25 Jun 1997 12:57:20 +0930 (CST) From: Michael Smith Message-Id: <199706250327.MAA28115@genesis.atrad.adelaide.edu.au> Subject: libedit, etc. (CVS issues) To: hackers@freebsd.org Date: Wed, 25 Jun 1997 12:57:20 +0930 (CST) X-Mailer: ELM [version 2.4ME+ PL28 (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-hackers@freebsd.org X-Loop: FreeBSD.org Precedence: bulk Ok; following on from the readline() discussion, I've been looking at the changes made to libedit and various other things by the NetBSD people. Most of these look pretty good, and I was planning on bringing their changes over. There are two different situations that I'm looking for some guidance on. Firstly, with libedit, the changes are fairly minor. There are a few new files and some small diffs to existing ones. - Should I be adding $Id$ to files that are modified but don't have it? - Should I keep the $NetBSD$ tags for files that are modified by the changes? - Andrey committed some 8-bit cleanness changes on 960811 which aren't in the NetBSD code. Are these changes still required? A second case is ftp. In this one, there have been no significant changes for quite some time, but the NetBSD changes are quite substantial. - Would it be best to drop the NetBSD code in wholesale on top, replacing what is there outright? - If not, should the $NetBSD$ tags still be preserved? - If so, should the NetBSD code come in on a vendor branch? Can someone clarify how I should do this if so? -- ]] Mike Smith, Software Engineer msmith@gsoft.com.au [[ ]] Genesis Software genesis@gsoft.com.au [[ ]] High-speed data acquisition and (GSM mobile) 0411-222-496 [[ ]] realtime instrument control. (ph) +61-8-8267-3493 [[ ]] Unix hardware collector. "Where are your PEZ?" The Tick [[