(no subject)

[root]

>From address@hidden  Thu Feb 15 04:47:03 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 
EAA24449
        for <address@hidden>; Thu, 15 Feb 2001 04:47:01 +0900
Received: from localhost ([127.0.0.1] helo=fencepost.gnu.org)
        by fencepost.gnu.org with esmtp (Exim 3.16 #1 (Debian))
        id 14T7rR-0004S1-00; Wed, 14 Feb 2001 14:45:09 -0500
Received: from [216.200.203.33] (helo=mail.openave.com)
        by fencepost.gnu.org with smtp (Exim 3.16 #1 (Debian))
        id 14T7pH-0004O6-00
        for <address@hidden>; Wed, 14 Feb 2001 14:42:55 -0500
Received: from openavenue.com
          (adsl-63-205-189-231.dsl.snfc21.pacbell.net [63.205.189.231])
          by mail.openave.com (Post.Office MTA v3.5.3 release 223
          ID# 0-61060U3000L300S0V35) with ESMTP id com;
          Wed, 14 Feb 2001 11:42:53 -0800
Message-ID: <address@hidden>
From: "Derek R. Price" <address@hidden>
Organization: Open Avenue
X-Mailer: Mozilla 4.76 [en] (X11; U; Linux 2.2.17-14 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: John Mocyk <address@hidden>
CC: CVS Information mailing list <address@hidden>
Subject: Re: CVS Merge problem - will not merge in new code
References: <address@hidden>
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: Wed, 14 Feb 2001 14:42:52 -0500
Status: O
Content-Length: 1713
Lines: 52

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 ( http://CVSHome.org )
mailto:address@hidden     OpenAvenue ( http://OpenAvenue.com )
--
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
http://mail.gnu.org/mailman/listinfo/info-cvs