bug-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:25:15 -0400

>From address@hidden  Fri Feb 16 04:44:25 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 
EAA01060
        for <address@hidden>; Fri, 16 Feb 2001 04:44: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 14TUFG-0002u5-00; Thu, 15 Feb 2001 14:39:14 -0500
Received: from [199.106.147.5] (helo=ntmail.ca.metsci.com)
        by fencepost.gnu.org with esmtp (Exim 3.16 #1 (Debian))
        id 14TUCo-00021P-00; Thu, 15 Feb 2001 14:36:42 -0500
Received: from reliant.ca.metsci.com ([192.168.12.103]) by ntmail.ca.metsci.com 
with SMTP (Microsoft Exchange Internet Mail Service Version 5.5.2653.13)
        id DK97W8WP; Thu, 15 Feb 2001 11:33:00 -0800
From: Jacob Burckhardt <address@hidden>
To: "Reinstein, Shlomo" <address@hidden>
Cc: "'address@hidden'" <address@hidden>, address@hidden
Subject: Strange conflicts as a result of merging a branch into the main t
        runk
In-Reply-To: <address@hidden>
References: <address@hidden>
X-Mailer: VM 6.89 under 21.1 (patch 12) "Channel Islands" XEmacs Lucid
Message-Id: <address@hidden>
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: Thu, 15 Feb 2001 14:36:42 -0500
Status: O
Content-Length: 2714
Lines: 64

Reinstein, Shlomo writes:
> 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...

That sounds like the same bug which Karl Tomlinson's patch fixes:

http://www.mail-archive.com/address@hidden/msg00554.html

I am working on some test cases for that patch for the CVS test script
sanity.sh.

I would like to know if your bug is the same bug that Karl fixed.  So
please send me the files which you tried to merge and I will then test
them on Karl's patch and I might want to include them in sanity.sh.

Please run these commands replacing "file" with the filename of the file
which wrongly had conflicts:

cvs -n up -p -r1.81 file > OLDER
cvs -n up -p -r1.81.2.17 file > YOURS

If your files contain proprietary or private information, then you
could try using a UNIX sed command to change it so it no longer has
private info:

sed 's/[a-z]/x/g' < OLDER > OLDER_changed
sed 's/[a-z]/x/g' < YOURS > YOURS_changed

So if the two private files are OLDER and YOURS, then you should be
able to send me the non-private files OLDER_changed and
YOURS_changed.

Thanks.


_______________________________________________
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]