[Top][All Lists]

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

Re: merging problem

From: Russ Sherk
Subject: Re: merging problem
Date: Wed, 26 Oct 2005 09:18:44 -0400

On 10/26/05, Patrick Guio <address@hidden> wrote:

Dear all,

I have added lately in a module a sub-directory with files.
These files were added to the cvs in a branch (not the head)
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.

If I try
% cvs update -A -j Mybranch doc/
cvs update: file doc/ exists, but has been added in revisionMyBranch

Looking at the log I find out that I want to merge

date: 2005-10-26 09:19:39 +0000;


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
% cvs update -r 1.2 -j doc/
cvs update: file doc/ exists, but has been added in revision

Does anybody has any idea of how to remedy to this?

Does this work?
cvs up -A doc/
cvs up -j MyBranch doc/



Info-cvs mailing list

reply via email to

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