[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Merge errors from HEAD to branch

From: Christian Robottom Reis
Subject: Merge errors from HEAD to branch
Date: Tue, 16 Mar 2004 11:52:25 -0300
User-agent: Mutt/1.3.28i

Hello there,

    I'm trying to merge a set of changes from HEAD to a branch opened a
while back. The changes I would like to merge were committed to HEAD
between 2 days ago and today; I'll use ChangeLog as an example because
it's a file being actively changed on both HEAD and branch. I have the
file on a branch checkout:

    address@hidden:~/devel/IC-0.6$ cvs status ChangeLog 
    File: ChangeLog         Status: Up-to-date

       Working revision:
       Repository revision:       /cvs/IndexedCatalog/ChangeLog,v
       Sticky Tag:          INDEXED_CATALOG_0_6_0_branch (branch: 1.222.2)
       Sticky Date:         (none)
       Sticky Options:      (none)

Now let's say I want to merge in the referred changes. The way I see it
(as per book and info reading) is:

    cvs up -j HEAD:"2 days ago" -j HEAD ChangeLog 

But what I get back is:

    cvs update: file ChangeLog exists, but has been added in revision HEAD

and no changes are merged onto the ChangeLog.

I've googled up and down for the error. It *seems* as though the error
results when CVS tries to create the file and sees it already exists in
the branch; however in this case it should definitely be possible to
track the fact that the files in branch and HEAD have a common ancestor
(version 1.222 in fact), and that therefore they are the same file.

Is this a gotcha or am I doing something silly? 

Is there a way to do this type of merge, or must I do it manually? 

Take care,
Christian Robottom Reis | | [+55 16] 261 2331

reply via email to

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