[Top][All Lists]

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

Re: up-to-date check failed from a lower revision to higher revision

From: Pierre Asselin
Subject: Re: up-to-date check failed from a lower revision to higher revision
Date: Sat, 10 Jul 2004 10:07:17 -0400
User-agent: tin/1.4.4-20000803 ("Vet for the Insane") (UNIX) (Linux/2.2.19-7.0.1 (i586))

Antony Paul <address@hidden> wrote:
>     I am new to CVS. I am using the cvs command line client in Linux. I have
> one file whose status is as follows
> cvs status: Examining .
> ===================================================================
> File: one.txt           Status: Locally Modified

>    Working revision: Sat Jul 10 08:53:39 2004
>    Repository revision: /home/cvsuser/cvsroot/work/base/one.txt,v
>    Sticky Tag:          1.4.1
>    Sticky Date:         (none)
>    Sticky Options:      (none)

It is unconventional to have a numeric sticky tag ...

>    Existing Tags:
>         No Tags Exist

... and no symbolic tags.  Anyway,

>     I started with version 1.1. I created a new version using the command
>     cvs commit -r 1.4.1 one.txt

Are you sure that's what you did ?  When I try something similar, I get
    $ cvs commit -r1.4.1 toto.c
    cvs commit: Up-to-date check failed for `toto.c'
    cvs [commit aborted]: correct above errors first!

It seems that you started with revision 1.4, not 1.1 as you said.
Either that, or the revision in your status output is wrong.
It looks like you cut'n pasted the output of cvs status, so I'll assume
that is correct and that your initial 1.1 was really 1.4 .

>         Then I modified the file and committed several time using
      cvs commit one.txt

That part works.

>     Now it is in revision The error occurred when I committed with
> the following command
>      cvs commit -r 1.5 -m '1.5' one.txt
>     What is wrong with it. I am the only person who works with this file and
> repository. I tried cvs update -C one.txt. Still it is giving error.

To finish off and make revision 1.5, commit one last time to the branch,
return to the trunk and merge your branch.

    cvs commit                  # creates rev
    cvs update -A one.txt       # returns to rev 1.4 and removes the changes
    cvs update -j 1.4.1 one.txt # pulls in the changes
    cvs status -v one.txt

The status should look something like this:

    File: one.txt           Status: Locally Modified

       Working revision:    1.4     Result of merge
       Repository revision: 1.4     /home/cvsuser/cvsroot/work/base/one.txt,v
       Sticky Tag:          (none)
       Sticky Date:         (none)
       Sticky Options:      (none)

       Existing Tags:
            No Tags Exist

The file contents will be that of revision, as if you had
checked out a fresh copy of 1.4 and manually edited into it.
Hence the status of "Locally Modified".  Just commit the result.

    cvs commit                  # creates rev 1.5 .

reply via email to

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