(no subject)

[root]

>From address@hidden  Fri Feb 16 00:59:54 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 
AAA00636
        for <address@hidden>; Fri, 16 Feb 2001 00:59:51 +0900
Received: from localhost ([127.0.0.1] helo=fencepost.gnu.org)
        by fencepost.gnu.org with esmtp (Exim 3.16 #1 (Debian))
        id 14TQmM-0003dk-00; Thu, 15 Feb 2001 10:57:10 -0500
Received: from heimdall.sdrc.com ([146.122.132.195] helo=sdrc.com)
        by fencepost.gnu.org with esmtp (Exim 3.16 #1 (Debian))
        id 14TQjx-0002oj-00
        for <address@hidden>; Thu, 15 Feb 2001 10:54:41 -0500
Received: from tyr.sdrc.com (mailhub-cvg.sdrc.com [146.122.142.31])
        by sdrc.com (8.9.1/8.9.1) with ESMTP id KAA02956;
        Thu, 15 Feb 2001 10:53:51 -0500 (EST)
Received: from thor.sdrc.com (address@hidden [146.122.62.108])
        by tyr.sdrc.com (8.8.6 (PHNE_17190)/8.8.5) with ESMTP id KAA19048;
        Thu, 15 Feb 2001 10:53:50 -0500 (EST)
Received: (from address@hidden)
        by thor.sdrc.com (8.9.0/8.9.0) id KAA00567;
        Thu, 15 Feb 2001 10:53:50 -0500 (EST)
Message-Id: <address@hidden>
Subject: Re: Vendor Tags etc.
To: address@hidden (Robert Longworth)
Cc: address@hidden
In-Reply-To: <address@hidden> from "Robert Longworth" at Feb 15, 1 02:24:29 pm
From: address@hidden (Larry Jones)
X-Mailer: ELM [version 2.4 PL25]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
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: Thu, 15 Feb 2001 10:53:49 -0500 (EST)
Status: O
Content-Length: 1132
Lines: 31

Robert Longworth writes:
> 
> My question boils down to this, if I have three directories of source code
> called (say)
> 
> Program1.0/
> Program1.0-tweeked/
> Program1.1/
> 
> where 1.0 and 1.1 are the non-modified versions of the source, how do I go
> about merging the changes made to 1.0 into 1.1, bearing in mind none of the
> source files are in the repository yet?

There isn't any easy way to do that.  What I would do is import
Program1.0 and then check it out into a working directory.  Then, either
copy all of the Program1.0-tweeked files over top of the working
directory or copy the CVS directories from the working directory into
the Program1.0-tweeked directory, and commit.  Then import Program1.1
and follow the usual procedures for importing a new vendor release.  The
key is to *not* import Program1.0-tweeked because it's local changes,
not a vendor release.

-Larry Jones

That's one of the remarkable things about life.  It's never so
bad that it can't get worse. -- Calvin

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