[Python-Dev] release22-maint branch strangeness

[Michael Hudson]

"Fred L. Drake, Jr." <fdrake@acm.org> writes:

> I've noticed some strangeness with the release22-maint branch.  I made
> a documentation change there this morning, and CVS gave the change a
> really weird version number when I checked it in.  Looking further, it
> looks like the previous checkin for that file (Doc/tut/tut.tex) has
> some strangeness as well.  The branching tags are also pretty
> whacked.  This is an excerpt of the "cvs log" for the file:

Looks to me like the release22 tag for Doc/tut/tut.tex was set on the
release22-branch, not the trunk.

This is not what happened for, e.g. configure.in.

Quite how this happened, or what (if anything) we should do about it,
is another question entirely.

cvs status -v is quite handy here.

$ cvs status -v Doc/tut/tut.tex | head -n 20
===================================================================
File: tut.tex           Status: Needs Patch

   Working revision:    1.157
   Repository revision: 1.158   /cvsroot/python/python/dist/src/Doc/tut/tut.tex,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

   Existing Tags:
        r212                            (revision: 1.133.2.5)
        r212c1                          (revision: 1.133.2.5)
        release22-mac                   (revision: 1.156.4.1)
        release22-maint                 (branch: 1.156.4.1.2)
        release22                       (revision: 1.156.4.1)
        release22-branch                (branch: 1.156.4)
        release22-fork                  (revision: 1.156)
        r22c1-mac                       (revision: 1.156)
        r22c1                           (revision: 1.156)
        r22rc1-branch                   (branch: 1.156.2)
$ cvs status -v configure.in | head -n 20
===================================================================
File: configure.in      Status: Up-to-date

   Working revision:    1.289
   Repository revision: 1.289   /cvsroot/python/python/dist/src/configure.in,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

   Existing Tags:
        r212                            (revision: 1.215.2.7)
        r212c1                          (revision: 1.215.2.7)
        release22-mac                   (revision: 1.288)
        release22-maint                 (branch: 1.288.6)
        release22                       (revision: 1.288)
        release22-branch                (branch: 1.288.4)
        release22-fork                  (revision: 1.288)
        r22c1-mac                       (revision: 1.288)
        r22c1                           (revision: 1.288)
        r22rc1-branch                   (branch: 1.288.2)

Did different people create the release22 tags in different bits of the tree?

Cheers,
M.

-- 
  The "of course, while I have no problem with this at all, it's
  surely too much for a lesser being" flavor of argument always
  rings hollow to me.                       -- Tim Peters, 29 Apr 1998