(no subject)

[root]

>From address@hidden  Wed Feb 14 21:05:25 2001
>Return-Path: <address@hidden>
Received: from fencepost.gnu.org (address@hidden [199.232.76.164])
        by gateway.camelot.jp (8.9.3/8.9.3/Debian 8.9.3-21) with ESMTP id 
VAA22303
        for <address@hidden>; Wed, 14 Feb 2001 21:05:19 +0900
Received: from localhost ([127.0.0.1] helo=fencepost.gnu.org)
        by fencepost.gnu.org with esmtp (Exim 3.16 #1 (Debian))
        id 14T0bR-0004qS-00; Wed, 14 Feb 2001 07:00:09 -0500
Received: from fmfdns02.fm.intel.com ([132.233.247.11] helo=thalia.fm.intel.com)
        by fencepost.gnu.org with esmtp (Exim 3.16 #1 (Debian))
        id 14T0ZN-0004ng-00
        for <address@hidden>; Wed, 14 Feb 2001 06:58:01 -0500
Received: from SMTP (fmsmsxvs04-1.fm.intel.com [132.233.42.204])
        by thalia.fm.intel.com (8.9.1a+p1/8.9.1/d: relay.m4,v 1.35 2001/02/12 
09:03:45 smothers Exp $) with SMTP id LAA22621
        for <address@hidden>; Wed, 14 Feb 2001 11:59:08 GMT
Received: from fmsmsx27.FM.INTEL.COM ([132.233.48.27]) by 132.233.48.204
  (Norton AntiVirus for Internet Email Gateways 1.0) ;
  Wed, 14 Feb 2001 11:57:44 0000 (GMT)
Received: by fmsmsx27.fm.intel.com with Internet Mail Service (5.5.2650.21)
        id <17D3K3YG>; Wed, 14 Feb 2001 03:57:43 -0800
Message-ID: <address@hidden>
From: "Reinstein, Shlomo" <address@hidden>
To: "'address@hidden'" <address@hidden>
Subject: Strange conflicts as a result of merging a branch into the main t
        runk
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1255
Content-Transfer-Encoding: 7bit
X-Mailer: Internet Mail Service (5.5.2650.21)
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 03:57:40 -0800
Status: O
Content-Length: 1673
Lines: 37

Hi,

I have encountered merge conflicts that are very strange to me:
At some point during the development of a project, we created a branch from
the main trunk. A lot of work was done in that branch, but ever since the
branch was created, NO work was done on main trunk. That is, the latest
version of the main trunk is the same version from which the branch was
forked off.
At some point, we wanted to merge the work done on the branch back into the
main trunk. To do this, we checked-out the latest version of the project
from the main trunk, and in the working directory that we got, we used:
        cvs update -j branch-name

Since no work was done on the main trunk since the creation of the branch,
I'd expect CVS to just update the working directory with the newest version
of the branch. (which would be the result of merging all changes made in the
branch into the working directory.) However, the results were different.
During this merge, we encountered conflicts! Can you explain this?

I'll give a few more details on this. We have a file named "isis.c". It's
latest version on the main trunk is 1.81. The latest version of this file on
the branch is 1.81.2.17. When we merged the changes made on the branch into
the main trunk, CVS output showed that it merged the changes between 1.81
and 1.81.2.17 into the working directory. The working directory contained
1.81 itself (the latest version of the main trunk), so I'd expect to get
1.81.2.17 as a result of the merge. However, instead of that I got
conflicts...

Thanks,
Shlomo



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