From: Brian J. Watson <Brian.J.Watson@hp...> - 2004-09-16 18:27:50
En Chiang Lee wrote:
> Hi Brian,
> The FC2 version of psmisc has been imported into the repository. With
> Bharata's checkins for system-config-network, all the non-kernel
> utilities have been ported to FC2.
Great job, guys!!
> I noticed that some files which are on the trunk have been given the
> alias OPENSSI-FC. However, files like Rules.mk whose OPENSSI-RH tag is
> not aliased to TRUNK don't have the OPENSSI-FC alias. Are these supposed
> to be aliased to OPENSSI-RH?
It's kind of hard to alias a branch like OPENSSI-RH. The reason why is
that the command to create an alias (cvs admin -n
<new_branch_name>:<old_branch_number> [files]) only takes a branch
number for the old branch, rather than a symbolic name. There is no
consistent branch number for OPENSSI-RH for all the files in the
repository like there is for trunk (1) or the REDHAT vendor branch (1.1.3).
We could create a branch alias for individual files like Rules.mk, but
I'm not sure it's worth the effort. We have to do syncing anyway, so we
might as well sync the few files like this that are only partially
common. I don't think there's very many of them, compared to the huge
number of completely common files. Besides, I think the OPENSSI-RH
branch is going to die once OpenSSI 1.2.x stabilizes. The OPENSSI-FC
branch is going to be our Red Hat code going forward.
Feel free to copy non-common files from OPENSSI-RH to OPENSSI-FC and
check them in there, making modifications as needed. For the Rules.mk
file, however, I'm inclined to eliminate it, as I discuss below.
> Also, the Makefile refers to the REDHAT tag to build the ssi patch for
> the utils. This has to be changed to FEDORA for OPENSSI-FC, so should
> this file be branched instead of just being aliased?
You're right. Can you branch Makefile for the Debian, RH and FC branches
and remove it from the trunk? You might need to delete the branch
aliases from Makefile first (cvs tag -d; you might also need the -B
option since you're deleting a branch tag).
While you're at it, you can eliminate Rules.mk and move its definitions
into each version of the Makefile? My original intention for Rules.mk
was that it be distro-specific and Makefile be common, but in practice
it has been more hassle than it's worth. I don't like Rules.mk anymore.