[1333] in Kerberos_V5_Development
merging the new admin stuff into the repository
daemon@ATHENA.MIT.EDU (Marc Horowitz)
Tue Jun 18 18:20:52 1996
To: krbdev@MIT.EDU
Cc: ghudson@cygnus.com
Date: Tue, 18 Jun 1996 18:20:34 EDT
From: Marc Horowitz <marc@cygnus.com>
Currently, the ov kadmin library, clients, and servers are not in the
CVS repository. Doing this for real will require some renaming, which
involves making changes to the repository which we are not prepared to
do quite yet.
However, it does seem that the admin stuff is named serendipitously,
allowing the new files to be added to the repository safely, delaying
the file renaming until later.
Ignoring the Attic directories, the kadmin dir in the repository
contains these top-level directories:
kadmin
kadmin/client
kadmin/kpasswd
kadmin/ktutil
kadmin/server
kadmin/v4server
kadmin/v5client
kadmin/v5server
The kadmin.ov working directory contains the following top-level
directories, managed by RCS:
kadmin.ov
kadmin.ov/cli
kadmin.ov/create
kadmin.ov/export
kadmin.ov/import
kadmin.ov/kdbkeys
kadmin.ov/keytab
kadmin.ov/passwd
kadmin.ov/scripts
kadmin.ov/server
kadmin.ov/testing
kadmin.ov/v4server
The only conflicts are server and v4server. Conveniently, in the CVS
repository, all these files are in Attic; they were killed on the
mainline on about 25 April 1995 (over a year ago); the latest date
present in any RCS file is 95.04.25.02.17.13. This means that these
directories can have files added to them without causing any problems,
unless someone somewhere is using a working dir 14 months old.
So, I propose that the kadmin.ov RCS files above be moved into the
kadmin directory of the repository, populating the repository with the
previous history of the files comprising the new admin system. These
files all have mainline numbers (1.x), so they will need to checked
back out into the working directory and appropriate tags and branches
created. This means that any cvs checkout or update following this
operation will include all the new admin files, but no Makefiles will
ever make reference to them. Changes will be made to the Makefiles on
the branch to build and use the new directories.
The same thing should be done with the lib/kadm5 directory.
The end result will be that:
- Old working directories will continue to work fine, although they
will have extra, currently unused files added to them at the next
update.
- New working directories created off the mainline or any other
branch besides OV_9510_INTEGRATION will also have these extra files.
- The OV_9510_INTEGRATION branch will contain all the files
comprising the new admin system, so that they can be managed with CVS
instead of RCS. It will also contain the old admin system, which will
not be referenced.
- checkouts by date on the mainline will act really weird, since the
dates of the new kadmin rcs files will remain unchanged. But there
should be no harm, since the Makefiles as of those dates on the
mainline will not reference any new kadmin files.
At some future point, the following needs to happen:
- The new admin system needs to be merged back into the mainline. An
arbitrary snapshot of the new admin system will be on the mainline as
an artifact of the import from RCS, but more work will progress on the
development branch. Also, some changes have been made in other parts
of the tree, such as in the kdb library. These will need to be merged
in, and conflicts resolved.
- The old directories and files need to be renamed into kadmin.beta6
or something like that. This will cause the respository to change
outside the CVS rep invariant, and will require some coordination
between all parties working out of the tree
Marc
