[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:20:02 -0400

>From address@hidden  Fri Feb 16 01:41:08 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>; Fri, 16 Feb 2001 01:41:06 +0900
Received: from localhost ([]
        by with esmtp (Exim 3.16 #1 (Debian))
        id 14TRLE-00057k-00; Thu, 15 Feb 2001 11:33:12 -0500
Received: from ([]
        by with smtp (Exim 3.16 #1 (Debian))
        id 14TRK6-00056U-00
        for <address@hidden>; Thu, 15 Feb 2001 11:32:02 -0500
Received: from ([])
          (InterMail vM. 201-229-121-113) with ESMTP
          id <address@hidden>;
          Thu, 15 Feb 2001 09:32:01 -0700
Message-ID: <address@hidden>
From: John Mocyk <address@hidden>
X-Mailer: Mozilla 4.73 [en] (WinNT; U)
X-Accept-Language: en
MIME-Version: 1.0
To: "Derek R. Price" <address@hidden>
CC: CVS Information mailing list <address@hidden>
Subject: Re: CVS Merge problem - will not merge in new code
References: <address@hidden> <address@hidden>
Content-Type: multipart/mixed;
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: Thu, 15 Feb 2001 08:31:47 -0800
Status: O
Content-Length: 3242
Lines: 100

This is a multi-part message in MIME format.
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

When does CVS consider a new file not new any more? A few of these files have 
modified and I would have thought they would have not been considered new 

I have about 137 files that give me this message and they where all new files 
have been created in the last 3 months. The files only reside on the branches 
tags but not on the MAIN trunk.

I guess I need to move all these files to the main trunk and do this for any new
files that are created in the future on my main branch..

The joy's of learning

Thank You

"Derek R. Price" wrote:

> John Mocyk wrote:
> > I get this message when I am trying to update a branch (same message
> > if from a static tag or branch) and it seems to occur with some of the
> > new files.
> > The branch is just a project that is being worked on and the statictag
> > is a tag of what was released into production and is code at
> > production level.
> >
> > eg.
> >
> >      cvs co -r branch1 cvs server: file
> >      pin60/setup/scripts/service_um.pod exists, but has been
> >      added in revision production
> >      cvs update -j production -Pd cvs server: file
> >      pin60/setup/scripts/service_um.pod
> >
> >              cvs server: file pin60/setup/scripts/service_um.pod
> >      exists, but has been added in revision production
> >
> >      This will occur on trying to merge in the changes from
> >      another branch as well.
> >      The file was created between the creation of branch1 and
> >      statictag.
> >
> >
> > What happen's is that any changes that I want bring in will not update
> > the code on the branch.
> If I understand your problem correctly, then that is intentional.  CVS
> sees new files on each branch and has no idea how to procedd with the
> merge.  It is expecting you to look at both versions and decide which is
> the keeper or merge them youself.
> Derek
> --
> Derek Price                      CVS Solutions Architect ( 
> )
> mailto:address@hidden     OpenAvenue ( )
> --
> I heard a lot of stories in my time.  They went along with the sound of the
> tinny piano playing in the parlor downstairs.
>                 - Humphrey Bogart as Rick, _Casablanca_
> _______________________________________________
> Info-cvs mailing list
> address@hidden

Content-Type: text/x-vcard; charset=us-ascii;
Content-Transfer-Encoding: 7bit
Content-Description: Card for John Mocyk
Content-Disposition: attachment;

org:Telus Advanced Communications;Internet Services
adr:;;4 -- 4595 Canada Way;Burnaby;BC;V5G 1J9;Canada
title:Release Manager
fn:John Mocyk


Info-cvs mailing list

reply via email to

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