[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Wed, 26 Oct 2005 12:28:34 +0200
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/Makefile.am
cvs update: file doc/Makefile.am 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;
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 220.127.116.11 doc/Makefile.am
cvs update: file doc/Makefile.am exists, but has been added in revision 18.104.22.168
Does anybody has any idea of how to remedy to this?
- merging problem,
Patrick Guio <=