From owner-freebsd-stable@FreeBSD.ORG Thu Apr 29 14:59:21 2004 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CBB4816A4CE for ; Thu, 29 Apr 2004 14:59:21 -0700 (PDT) Received: from out007.verizon.net (out007pub.verizon.net [206.46.170.107]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A97643D2F for ; Thu, 29 Apr 2004 14:59:21 -0700 (PDT) (envelope-from dgl@kirk.dlee.org) Received: from kirk.dlee.org ([141.156.37.12]) by out007.verizon.net (InterMail vM.5.01.06.06 201-253-122-130-106-20030910) with ESMTP id <20040429215920.KCGT28276.out007.verizon.net@kirk.dlee.org> for ; Thu, 29 Apr 2004 16:59:20 -0500 Received: from kirk.dlee.org (dgl@localhost.dlee.org [127.0.0.1]) by kirk.dlee.org (8.12.9p2/8.12.9) with ESMTP id i3TLxJG9056844 for ; Thu, 29 Apr 2004 17:59:19 -0400 (EDT) (envelope-from dgl@kirk.dlee.org) Received: (from dgl@localhost) by kirk.dlee.org (8.12.9p2/8.12.9/Submit) id i3TLxIcl056843 for freebsd-stable@freebsd.org; Thu, 29 Apr 2004 17:59:19 -0400 (EDT) (envelope-from dgl) Date: Thu, 29 Apr 2004 17:59:18 -0400 From: Doug Lee To: freebsd-stable@freebsd.org Message-ID: <20040429215917.GZ55912@kirk.dlee.org> Mail-Followup-To: Doug Lee , freebsd-stable@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Organization: Bartimaeus Group User-Agent: Mutt/1.5.4i X-Authentication-Info: Submitted using SMTP AUTH at out007.verizon.net from [141.156.37.12] at Thu, 29 Apr 2004 16:59:20 -0500 Subject: Can I maintain config files as a CVS branch w/o messing up mergemaster etc.? X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Apr 2004 21:59:21 -0000 I track STABLE and wonder if there's a clean way for me to use CVS to do it (without having the whole CVS repo on my box). Example: I modify /etc/rc.firewall and then cvsup my way up to a more current STABLE. The normal tactic is to hand-merge via mergemaster, but I think there should be a way for me to get CVS to do it: cvsup/mergemaster for fresh system (hypothetical of course) (current /etc/rc.firewall is now exactly the STABLE version) make local mods cvs commit mods (locally) cvsup use CVS instead of Mergemaster to merge in changes since last cvsup Problems: 1. FreeBSD itself uses CVS, so I don't think I can just create a repo of my config files and pull in cvsups as a vendor branch. 2. Mergemaster (which might still be useful alongside this sometimes) uses CVS Id strings to notice when a file hasn't really changed in the main FreeBSD repository, so even if I do start managing my config files by CVS despite the above issue, I think I'd be making Mergemaster throw a lot more stuff at me to do myself. Comments and ideas welcome. Please Cc me if that's ok. -- Doug Lee dgl@dlee.org http://www.dlee.org Bartimaeus Group doug@bartsite.com http://www.bartsite.com "Pray devoutly, but hammer stoutly." --Sir William G. Benham