[Top][All Lists]

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

Re: Problem in CVS merge

From: Larry Jones
Subject: Re: Problem in CVS merge
Date: Thu, 4 Oct 2007 11:15:25 -0400 (EDT)

address@hidden writes:
> I have a file "a.c" which has the graph as below,
> 1.1-----> (branch_01)
>   |
>   |
> 1.2
> My local repository is updated with version 1.2.
> I try doing a merge with the following command,
> cvs update -j branch_01 a.c

That should work.  What does CVS say when you do that update?  It should
be something like:

        RCS file: /tmp/cvstest/CVSROOT/a.c,v
        retrieving revision 1.1
        retrieving revision
        Merging differences between 1.1 and into a.c

If not, then your file doesn't have the graph you think it does or you
weren't updated to the revision you think you were.

-Larry Jones

TIME?!  I just finished the first problem! -- Calvin

reply via email to

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