Re: (no subject)

[Mike Castle]

On Thu, Jun 14, 2001 at 01:58:11PM -0500, Alex Flores wrote:
> D:\CVS\CVSwork\practice_folder>cvs update -j rel_1_0_practice
> practice_alex.cpp
> M practice_alex.cpp
> RCS file: d:/cvs/practice_folder/practice_alex.cpp,v
> retrieving revision 1.5
> retrieving revision 1.5.2.2
> Merging differences between 1.5 and 1.5.2.2 into practice_alex.cpp
> rcsmerge: warning: conflicts during merge

That this point, you need to edit the file and resolve the conflicts.

Look for lines with <<<, ===, and >>> in them.  They mark the boundaries of
the conflicting areas.

> D:\CVS\CVSwork\practice_folder>cvs update -j 1.5.2.2 -j 1.9
> practice_alex.cpp
> C practice_alex.cpp

I'm not sure this command makes send here.  1.9 is on the main branch,
which you said you were working on already.  So what this command will do
is create a diff between 1.5.2.2 and 1.9 and apply it.  Since that would
essentially be applying the same set of changes back onto yourself, it
doesn't seem to make much sense.

> D:\CVS\CVSwork\practice_folder>cvs commit
> cvs commit: Examining .
> cvs [commit aborted]: end of file from server (consult above messages if
> any)

You can't do a commit until you resolve the conflicts above.

mrc
-- 
     Mike Castle      address@hidden      www.netcom.com/~dalgoda/
    We are all of us living in the shadow of Manhattan.  -- Watchmen
fatal ("You are in a maze of twisty compiler features, all different"); -- gcc