[Top][All Lists]

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

Re: merging problem

From: Larry Jones
Subject: Re: merging problem
Date: Wed, 26 Oct 2005 09:21:50 -0400 (EDT)

Patrick Guio writes:
> And I merged the files after into the head without trouble.
> I made a few changes in a file in the branch and committed those changes 
> in that branch but I have trouble to merge the changes on the head.

You need to (re)read the section of the manual on Branching and Merging.
If you're going to merge from a branch more than once, you *must* tag
the branch after each merge so you know where to start merging from the
next time.  Otherwise, you end up trying to merge the same changes
multiple times which leads to the kinds of problems you're having.

> Looking at the log I find out that I want to merge
> revision
> date: 2005-10-26 09:19:39 +0000;
> into
> revision 1.2
> date: 2005-10-26 08:35:57 +0000;
> If I try the merging command with revision number I get the same error 
> message
> % cvs update -r 1.2 -j doc/
> cvs update: file doc/ exists, but has been added in revision 

You're doing the merge wrong.  You merge the changes *between* two
revisions into another revision.  In this case, you want to merge the
changes between revisions and into the head of the trunk
(revision 1.2), so the command you want is:

        cvs up -r1.2 -j1.1.2.1 -j1.1.2.2 doc/

(If you already have revision 1.2 in your working directory, which you
probably do, you don't need the "-r1.2".)

-Larry Jones

I don't NEED to compromise my principles, because they don't have
the slightest bearing on what happens to me anyway. -- Calvin

reply via email to

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