(no subject)

[root]

>From address@hidden  Fri Feb  2 22:13:42 2001
>Return-Path: <address@hidden>
Received: from fencepost.gnu.org (fencepost.gnu.org [199.232.76.164])
        by gateway.camelot.jp (8.9.3/8.9.3/Debian 8.9.3-21) with ESMTP id 
WAA30642
        for <address@hidden>; Fri, 2 Feb 2001 22:13:41 +0900
Received: from localhost ([127.0.0.1] helo=fencepost.gnu.org)
        by fencepost.gnu.org with esmtp (Exim 3.16 #1 (Debian))
        id 14OfxY-0000IN-00; Fri, 02 Feb 2001 08:09:04 -0500
Received: from adsl-63-206-116-49.dsl.snfc21.pacbell.net ([63.206.116.49] 
helo=linux.interlinx.bc.ca)
        by fencepost.gnu.org with esmtp (Exim 3.16 #1 (Debian))
        id 14OfwP-0000E4-00
        for <address@hidden>; Fri, 02 Feb 2001 08:07:53 -0500
Received: (from address@hidden)
        by linux.interlinx.bc.ca (8.11.0/8.11.0) id f12D7g931831
        for <address@hidden>; Fri, 2 Feb 2001 05:07:43 -0800
Received: from pc.ilinx(10.75.2.1), claiming to be "pc.interlinx.bc.ca"
 via SMTP by linux.ilinx, id smtpdRUKW1d; Fri Feb  2 05:07:38 2001
Received: (from address@hidden)
        by pc.interlinx.bc.ca (8.11.2/8.11.1) id f12D7ar01110
        for address@hidden; Fri, 2 Feb 2001 05:07:36 -0800
To: address@hidden
Subject: Easiest way to move a branch to the trunk
Message-ID: <address@hidden>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
From:
  "Brian J. Murrell" <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: <http://mail.gnu.org/mailman/listinfo/info-cvs>,
        <mailto:address@hidden>
List-Id: Announcements and discussions for the CVS version control system 
<info-cvs.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/info-cvs>,
        <mailto:address@hidden>
List-Archive: <http://mail.gnu.org/pipermail/info-cvs/>
Date: Fri, 2 Feb 2001 05:07:31 -0800
Status: O
Content-Length: 972
Lines: 26

I have a project/repository which has a main branch (trunk) for
stable, released versions and a development branch.  The development
branch was branched off of the main branch a while ago for development
and has going along gangbusters.  Now it is time to release.  What is
the easiest way to move the develoment branch onto the main branch so
that what is on the main branch is completely replaced by the
development branch.

I realize of course I could use "cvs update -j" to move it all over
but that is going to create a boatload of conflicts.  I can deal with
conflicts easily (and tediously) enough but I wonder why I should need
to bother.  It seems that I should be able to simply replace the
contents of the main branch with the development branch in an easier
way, no?

All suggestions welcome, thanx.

b.

-- 
Brian J. Murrell

_______________________________________________
Info-cvs mailing list
address@hidden
http://mail.gnu.org/mailman/listinfo/info-cvs