Bug in cvs commit

[Raye Raskin]

>Submitter-Id:   net
>Originator:     Raye Raskin
>Organization:
net
>Confidential:  no
>Synopsis:      Files committed in a branch tree went to trunk.
>Severity:      serious
>Priority:      low
>Category:      cvs
>Class:         sw-bug
>Release:       1.11.17-FreeBSD
>Environment:
        Server:
System: FreeBSD water.nexthop.com 5.4-RELEASE FreeBSD 5.4-RELEASE #0:
Sun May 8 10:21:06 UTC 2005
root@harlow.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
        Client:
        Linux localhost.localdomain 2.6.5-1.358 #1 Sat May 8 09:04:50
EDT 2004 i686 athlon i386 GNU/Linux
>Description:
        A commit from a branch working directory caused files to be
        committed to the Main Trunk.  I realize the developer did not do
        the right thing (see below) but what he did exposed a cvs bug.
>How-To-Repeat:
        A developer created a bunch of new files and new directories.
He
        "cvs add"'ed them to the Main Trunk before it was decided to
create
        a branch for all his new work.  But he didn't do a commit.  The
new
        directories were added to the repository, as cvs is wont to do,
but
        that doesn't hurt anything.

        I then created the branch.

        The developer then checked out the branch, cleanly.

        The developer then made a mistake: He copied all his new files
and
        directories into his working branch directory without adding
them
        there.

        So at this point in his working branch checkout he had:

          modified files that already existed in the branch
          new files and directories copied into his working branch
checkout

        He then did a "cvs commit".  This seems to have exposed a bug in
        cvs.  To wit: Even though he hadn't done a "cvs add" in his
branch
        tree, cvs took the files and committed them on the trunk where
he
        HAD added them.
>Fix:
        remove the files from the working Main Trunk tree.
        "cvs rm" the uncommitted files
    or
        "cvs add" the files in the working branch tree.
        "cvs commit" in the working branch tree.

Thanks.  

Raye Raskin