[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

(no subject)

From: root
Subject: (no subject)
Date: Mon, 13 Aug 2001 05:06:36 -0400

>From address@hidden  Sun Feb  4 01:17:49 2001
>Return-Path: <address@hidden>
Received: from ( [])
        by (8.9.3/8.9.3/Debian 8.9.3-21) with ESMTP id 
        for <address@hidden>; Sun, 4 Feb 2001 01:17:47 +0900
Received: from localhost ([]
        by with esmtp (Exim 3.16 #1 (Debian))
        id 14P5CP-0000Cm-00; Sat, 03 Feb 2001 11:06:05 -0500
Received: from ([])
        by with esmtp (Exim 3.16 #1 (Debian))
        id 14P59w-00009W-00
        for <address@hidden>; Sat, 03 Feb 2001 11:03:33 -0500
Received: from (address@hidden [])
        by (8.8.7/8.8.7) with ESMTP id JAA04229;
        Sat, 3 Feb 2001 09:08:01 -0700
Message-Id: <address@hidden>
X-Mailer: exmh version 2.0.2
To: Dorthe Luebbert <address@hidden>
Cc: address@hidden
Subject: Re: Turning a branch into a new branch 
In-Reply-To: Your message of "Sat, 03 Feb 2001 11:57:36 +0100."
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
From: Pierre Asselin <address@hidden>
Sender: address@hidden
Errors-To: address@hidden
X-BeenThere: address@hidden
X-Mailman-Version: 2.0
Precedence: bulk
List-Help: <mailto:address@hidden>
List-Post: <mailto:address@hidden>
List-Subscribe: <>,
List-Id: Announcements and discussions for the CVS version control system 
List-Unsubscribe: <>,
List-Archive: <>
Date: Sat, 03 Feb 2001 09:08:01 -0700
Status: O
Content-Length: 1510
Lines: 41

> 1. I checked out branch VERSION-A
> 2. I modified some files locally
> 3. I want to create from the these files VERSION-B
> CVS asks me to commit the modified files first. But I would commit them
> to VERSION-A, though they should not exist in VERSION A.

General procedure to start a new branch as an afterthought:

    $ cvs tag VERSION-B-bp     : tag the starting point
    $ cvs tag -b VERSION-B     : create the branch
    $ cvs update -rVERSION-B   : get on the branch
    $ cvs commit               : commit pending changes to the branch

The first command places the tag `VERSION-B-bp' on the revision you
checked out (i.e. before your changes).  It's for future reference only.

The second command starts a branch off of the same revision, still before
your changes.

The third command "puts you on the branch".  This consists of two actions:
1)  It merges the pending changes in your sandbox with all the changes that
    have occurred on branch `VERSION-B';  the branch is empty, so this is a
    vacuous merge.  Your sandbox files don't really change.
2)  It plants a sticky tag for `VERSION-B' in your sandbox's administrative

The fourth command commits your changes.  Because of the sticky tag, the
commit goes to VERSION-B.  Use `cvs update -A' to stop working on the branch
and return to the trunk.

Pierre Asselin
Westminster, Colorado

Info-cvs mailing list

reply via email to

[Prev in Thread] Current Thread [Next in Thread]