(no subject)

[root]

>From address@hidden  Thu Feb 15 23:33:09 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 
XAA32680
        for <address@hidden>; Thu, 15 Feb 2001 23:33:07 +0900
Received: from localhost ([127.0.0.1] helo=fencepost.gnu.org)
        by fencepost.gnu.org with esmtp (Exim 3.16 #1 (Debian))
        id 14TPQA-0005ME-00; Thu, 15 Feb 2001 09:30:10 -0500
Received: from relay.mail.pipex.net ([158.43.128.38])
        by fencepost.gnu.org with smtp (Exim 3.16 #1 (Debian))
        id 14TPNa-0005Hx-00
        for <address@hidden>; Thu, 15 Feb 2001 09:27:30 -0500
Received: (qmail 11576 invoked from network); 15 Feb 2001 14:27:27 -0000
Received: from mailhost.dateldef.co.uk (HELO p3b8c.dateldef.co.uk) 
(193.128.191.65)
  by iprelay.mail.pipex.net with SMTP; 15 Feb 2001 14:27:27 -0000
Received: from 192.168.50.5 by relay0.dateldef.co.uk 
 Thu, 15 Feb 2001 14:25:46 -0000
Received: from ddlserv02.ddl (ddlserv02.dateldef.co.uk) by p3b8c.dateldef.co.uk
 (Content Technologies SMTPRS 4.1.5) with ESMTP id <address@hidden> for 
<address@hidden>;
 Thu, 15 Feb 2001 14:23:10 +0000
Received: by ddlserv02.dateldef.co.uk with Internet Mail Service (5.5.2448.0)
        id <1RBZRGB7>; Thu, 15 Feb 2001 14:24:33 -0000
Message-ID: <address@hidden>
From: Robert Longworth <address@hidden>
To: "'address@hidden'" <address@hidden>
Subject: Vendor Tags etc.
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 7bit
X-Mailer: Internet Mail Service (5.5.2448.0)
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 14:24:29 -0000
Status: O
Content-Length: 2297
Lines: 65

Hi All,

I've read in the CVS documentation about how to merge changes to source code
from the vendor with changes made locally, ie; Program v1.0 is released,
tweaked by ourselves, then Program v1.1 comes out, you want to merge the
changes made by ourselves with the changes made in v1.0 . I can do this by
first importing v1.0 into the repository and checking out the files I want
to edit, then importing v1.1 when it comes out and merging the changes with

cvs import myprogram VEND R1_1  (in c:/ver1.1)

(in the first import I used VEND R1_0)

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? I think it revolves around what to
put into the vendor and release tags for each of the three imports.. I'm
finding all this importing/checking out/commiting very confusing and I've
not even looked at Branches yet!

Any help much appreciated, I'm using WinCVS 1.1b17.

Cheers,

---
Robbie Longworth
Graduate Engineer
Datel Defence Ltd



**********************************************************************

--------------------------------------------------------------
Unless confirmed in writing the information contained in this
message is for information only. The contents of this message 
are mine and may not in any way reflect the views of any member
company of Datel Defence Ltd. Datel Defence Ltd reserve the right
to monitor e-mail at any time.

An Ultra Electronics Company
--------------------------------------------------------------

This email and any files transmitted with it are confidential and
intended solely for the use of the individual or entity to whom they
are addressed. If you have received this email in error please notify
the system manager.

This footnote also confirms that this email message has been swept by
MIMEsweeper for the presence of computer viruses.

www.mimesweeper.com
**********************************************************************

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