[Top][All Lists]

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

merge a new file from the trunk onto a branch?

From: Kevin Rodgers
Subject: merge a new file from the trunk onto a branch?
Date: Mon, 27 Mar 2006 12:10:25 -0700
User-agent: Mozilla Thunderbird 0.9 (X11/20041105)

I'm in the working directory for branch build-15-va.  I want to merge
the new helpers/ directory/file that was
introduced on the trunk between build-15 (the GCA) and build-20:

cvs update -kk -j build-15 -j build-20 helpers/

But when I commit it, it complains:

cvs commit -r build-15-va -m "Merged document abstract changes from trunk" helpers/

cvs commit: Up-to-date check failed for `helpers/'
cvs [commit aborted]: correct above errors first!

The manual (F.1 Partial list of error messages) says:

`cvs commit: Up-to-date check failed for `FILE''
     This means that someone else has committed a change to that file
     since the last time that you did a `cvs update'.  So before
     proceeding with your `cvs commit' you need to `cvs update'.

But no one has committed any changes -- this is the original version of
the file, which `cvs status -v` confirms:

File:   Status: Up-to-date

   Working revision:    1.1
Repository revision: 1.1 /ihs_net/esd/cvs/helpers/,v
   Commit Identifier:   iEyo2pIBHrbINpqr
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      -kk

   Existing Tags:
        build-20                        (revision: 1.1)
        build-19                        (revision: 1.1)

What do I need to do to commit helpers/
on the branch?


reply via email to

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