[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:19 -0400

>From address@hidden  Sat Feb  3 04:42:53 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>; Sat, 3 Feb 2001 04:42:51 +0900
Received: from localhost ([]
        by with esmtp (Exim 3.16 #1 (Debian))
        id 14Om2z-0000PV-00; Fri, 02 Feb 2001 14:39:05 -0500
Received: from [] (
        by with esmtp (Exim 3.16 #1 (Debian))
        id 14Om1W-0008AF-00
        for <address@hidden>; Fri, 02 Feb 2001 14:37:35 -0500
Received: from (aukland.YP.tgx [])
        by (8.9.3/8.9.1) with SMTP id LAA21337;
        Fri, 2 Feb 2001 11:37:30 -0800 (PST)
Received: from lima by (SMI-8.6/SMI-SVR4)
        id LAA12886; Fri, 2 Feb 2001 11:37:29 -0800
Message-Id: <address@hidden>
From: Stephen Rasku <address@hidden>
Reply-To: Stephen Rasku <address@hidden>
Subject: Re: Easiest way to move a branch to the trunk
To: address@hidden
Cc: address@hidden
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-MD5: 7Y9VCdz5w4Bu5wCfShFFvg==
X-Mailer: dtmail 1.3.0 @(#)CDE Version 1.3.5 SunOS 5.7 sun4u sparc 
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: Fri, 2 Feb 2001 11:37:29 -0800 (PST)
Status: O
Content-Length: 904
Lines: 35

Brian Murrel wrote:

>But what to do about files that are on the head but not in the branch
>and vice versa?  Figure out which ones are which and do some "cvs 
>and "cvs delete"s?

If you cvs update -p a file that only exists on the branch it will 
create it.  If you do:

        cvs status new-file
it will show:

        cvs server: use `cvs add' to create an entry for local.h
If you cvs update -p a file that doesn't exist on the branch, you will 
get a zero length file.

These should be good clues as to which files to add and delete.

By the way, what's with the weird e-mail addresses (e.g. 

Stephen Rasku                   E-mail: address@hidden
Senior Software Engineer        Web:
TGI Technologies

Info-cvs mailing list

reply via email to

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