From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23369 invoked by alias); 20 Sep 2002 05:29:49 -0000 Mailing-List: contact gdb-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sources.redhat.com Received: (qmail 23361 invoked from network); 20 Sep 2002 05:29:48 -0000 Received: from unknown (HELO mail.cdt.org) (206.112.85.61) by sources.redhat.com with SMTP; 20 Sep 2002 05:29:48 -0000 Received: from www.dberlin.org (pool-138-88-150-10.esr.east.verizon.net [138.88.150.10]) by mail.cdt.org (Postfix) with ESMTP id 4BEBA49006E; Fri, 20 Sep 2002 01:07:07 -0400 (EDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by www.dberlin.org (Postfix) with ESMTP id 5A8271810062; Fri, 20 Sep 2002 01:29:47 -0400 (EDT) Date: Thu, 19 Sep 2002 22:29:00 -0000 From: Daniel Berlin To: Keith Seitz Cc: Kevin Buettner , Subject: Re: branching In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-SW-Source: 2002-09/txt/msg00302.txt.bz2 On Thu, 19 Sep 2002, Keith Seitz wrote: > On Thu, 19 Sep 2002, Kevin Buettner wrote: > > > Do you create a new tag for each merge? > > Yes: > kseitz_interps-20020829-merge (revision: 1.69) > kseitz_interps-20020809-merge (revision: 1.66) > kseitz_interps-20020722-merge (revision: 1.65) > kseitz_interps-20020619-merge (revision: 1.61) > kseitz_interps-20020528-branch (branch: 1.59.4) > kseitz_interps-20020528-branchpoint (revision: 1.59) > > > Do you remove old tags that are no longer useful? > > Can this be done? I've never heard of anyone removing a tag. Hmm, indeed: > > $ cvs rtag --help > [snip] > -d Delete the given tag. > [snip] > > Wow. I guess I should get rid of the older tags (or use the -F option to > move a tag). In fact, if you really want to be advanced, and not deal with the slowdown on merged files that haven't been modified by you on the branch, but have been on the merge (This is hard to explain. If you merge from the head, and commit the result, it makes a new revision in the file, even if you haven't made changes on the branch. This eventually makes accessing the branch *quite* slow), you can just move the branch tags on the files you haven't modified on the branch, so that they refer to the new mainline revision. Sounds more difficult complex than it is. > > Keith > > >