From owner-freebsd-questions@FreeBSD.ORG Thu Apr 29 09:01:26 2004 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0B73C16A4D1 for ; Thu, 29 Apr 2004 09:01:26 -0700 (PDT) Received: from out009.verizon.net (out009pub.verizon.net [206.46.170.131]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6367743D48 for ; Thu, 29 Apr 2004 09:01:25 -0700 (PDT) (envelope-from dgl@kirk.dlee.org) Received: from kirk.dlee.org ([141.156.37.12]) by out009.verizon.net (InterMail vM.5.01.06.06 201-253-122-130-106-20030910) with ESMTP id <20040429160124.ISIL29216.out009.verizon.net@kirk.dlee.org> for ; Thu, 29 Apr 2004 11:01:24 -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 i3TG1NG9053776 for ; Thu, 29 Apr 2004 12:01:23 -0400 (EDT) (envelope-from dgl@kirk.dlee.org) Received: (from dgl@localhost) by kirk.dlee.org (8.12.9p2/8.12.9/Submit) id i3TG1M7U053775 for freebsd-questions@freebsd.org; Thu, 29 Apr 2004 12:01:23 -0400 (EDT) (envelope-from dgl) Date: Thu, 29 Apr 2004 12:01:22 -0400 From: Doug Lee To: freebsd-questions@freebsd.org Message-ID: <20040429160122.GX55912@kirk.dlee.org> Mail-Followup-To: Doug Lee , freebsd-questions@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 out009.verizon.net from [141.156.37.12] at Thu, 29 Apr 2004 11:01:24 -0500 Subject: How do you keep track of what's been merged in CVS? X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Apr 2004 16:01:26 -0000 I ask this here because FreeBSD is managed by CVS... My understanding of the FreeBSD development model is that "current" is the CVS trunk, "stable" is a branch started at the latest release tag, and an MFC consists of selectively merging revisions from the trunk to the Stable branch. If that's right, how do you keep track of what's been merged and what hasn't, particularly when merges may not occur in chronological, or revision number order, or (if this applies) when a merge is edited while being merged and does not contain the full effect of the corresponding original code? Also, is there a way to cause a file on a branch to track HEAD on the trunk automatically? (I asked that on the cvs-info list and noticed no answer I'm learning to use CVS to manage my own (much smaller) projects, and I'm just beginning to realize that if I don't find an answer to this one, I'll get my head spinning pretty soon trying to keep branches up to date with trunk activity. Thanks much. Please Cc replies to me if you think about it. -- Doug Lee dgl@dlee.org http://www.dlee.org Bartimaeus Group doug@bartsite.com http://www.bartsite.com "Determine that the thing can and shall be done, and then...find the way." - Abraham Lincoln