info-cvs
[Top][All Lists]
Advanced
[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:19:56 -0400 
>From address@hidden  Thu Feb 15 03:49:39 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 
DAA24327
        for <address@hidden>; Thu, 15 Feb 2001 03:49:33 +0900
Received: from localhost ([127.0.0.1] helo=fencepost.gnu.org)
        by fencepost.gnu.org with esmtp (Exim 3.16 #1 (Debian))
        id 14T6vR-000088-00; Wed, 14 Feb 2001 13:45:13 -0500
Received: from fepout2.telus.net ([199.185.220.237] 
helo=priv-edtnes04-hme0.telusplanet.net)
        by fencepost.gnu.org with smtp (Exim 3.16 #1 (Debian))
        id 14T6tG-0008U9-00
        for <address@hidden>; Wed, 14 Feb 2001 13:42:58 -0500
Received: from telus.net ([206.108.198.215])
          by priv-edtnes04-hme0.telusplanet.net
          (InterMail vM.4.01.03.10 201-229-121-110) with ESMTP
          id <address@hidden>
          for <address@hidden>; Wed, 14 Feb 2001 11:42:49 -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: CVS Information mailing list <address@hidden>
Subject: CVS Merge problem - will not merge in new code
Content-Type: multipart/mixed;
 boundary="------------E94E1B49087A8E2DBD43165D"
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 10:42:36 -0800
Status: O
Content-Length: 3098
Lines: 91

This is a multi-part message in MIME format.
--------------E94E1B49087A8E2DBD43165D
Content-Type: multipart/alternative;
 boundary="------------E576069234C9100FA8C2E3BA"


--------------E576069234C9100FA8C2E3BA
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

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.

--------------E576069234C9100FA8C2E3BA
Content-Type: text/html; charset=us-ascii
Content-Transfer-Encoding: 7bit

<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
<html>
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.
<br>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.
<p>eg.
<blockquote>cvs co -r branch1 cvs server: file 
pin60/setup/scripts/service_um.pod
exists, but has been added in revision production
<br>cvs update -j production -Pd cvs server: file 
pin60/setup/scripts/service_um.pod
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; cvs server: file 
pin60/setup/scripts/service_um.pod
exists, but has been added in revision production
<p>This will occur on trying to merge in the changes from another branch
as well.
<br>The file was created between the creation of branch1 and 
statictag.</blockquote>

<p><br>What happen's is that any changes that I want bring in will not
update the code on the branch.</html>

--------------E576069234C9100FA8C2E3BA--

--------------E94E1B49087A8E2DBD43165D
Content-Type: text/x-vcard; charset=us-ascii;
 name="john_mocyk.vcf"
Content-Transfer-Encoding: 7bit
Content-Description: Card for John Mocyk
Content-Disposition: attachment;
 filename="john_mocyk.vcf"

begin:vcard 
n:Mocyk;John 
tel;fax:(604)482-5722
tel;work:(604)482-5742
x-mozilla-html:FALSE
org:Telus Advanced Communications;Internet Services
adr:;;4 -- 4595 Canada Way;Burnaby;BC;V5G 1J9;Canada
version:2.1
email;internet:address@hidden
title:Release Manager
fn:John Mocyk
end:vcard

--------------E94E1B49087A8E2DBD43165D--


_______________________________________________
Info-cvs mailing list
address@hidden
http://mail.gnu.org/mailman/listinfo/info-cvs
reply via email to
[Prev in Thread] Current Thread [Next in Thread]