From owner-freebsd-current@FreeBSD.ORG Thu Feb 19 09:43:38 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1DC1516A4CE; Thu, 19 Feb 2004 09:43:38 -0800 (PST) Received: from nagual.pp.ru (pobrecita.freebsd.ru [194.87.13.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6975C43D1F; Thu, 19 Feb 2004 09:43:37 -0800 (PST) (envelope-from ache@pobrecita.freebsd.ru) Received: from pobrecita.freebsd.ru (ache@localhost [127.0.0.1]) by nagual.pp.ru (8.12.11/8.12.11) with ESMTP id i1JHhZXf060290; Thu, 19 Feb 2004 20:43:35 +0300 (MSK) (envelope-from ache@pobrecita.freebsd.ru) Received: (from ache@localhost) by pobrecita.freebsd.ru (8.12.11/8.12.11/Submit) id i1JHhZiK060289; Thu, 19 Feb 2004 20:43:35 +0300 (MSK) (envelope-from ache) Date: Thu, 19 Feb 2004 20:43:35 +0300 From: Andrey Chernov To: current@freebsd.org, cvs@freebsd.org Message-ID: <20040219174334.GA60017@nagual.pp.ru> Mail-Followup-To: Andrey Chernov , current@freebsd.org, cvs@freebsd.org, roberto@keltia.freenix.fr, des@des.no, nate@root.org, ru@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.5.1i cc: roberto@keltia.freenix.fr cc: nate@root.org cc: des@des.no Subject: How to deal with deletes between imports (suggestion) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Feb 2004 17:43:38 -0000 What Ruslan writes in the Message-ID: <20040219090357.GD5351@ip.net.ua>: > So yes, we should remove getopt* files on vendor branches, but only > after the next import, and also if this new import has them in > exclude list. gives me interesting idea. It is clear that always waiting for the next import to remove something is too unrealistic, some programs not touched for years. In the same time what already imported must be keeped in sync with evolving FreeBSD changes. It means that FREEBSD-Xlist alone, which reflects import state at the moment of importing can't play its role to reflect changes between imports too. So I suggest adding yet one file (gcc already do that way), FREEBSD-deleted (or maybe under some other name) where changes between imports reflected while NOT removing anything from the vendor branch. On the next import somebody merge contents of FREEBSD-deleted into FREEBSD-Xlist and actually delete them from the vendor branch, removing FREEBSD-deleted. Lets return to my case as example: to fix situation in that way I may remove getopt* lines from FREEBSD-Xlist's and put them into FREEBSD-deleted's instead. -- Andrey Chernov | http://ache.pp.ru/