From: Brian J. Watson <Brian.J.W<atson@hp...> - 2004-02-27 08:59:01
For the first time in awhile, today I synced the RH branch with the
Debian branch. As it turns out, the only change I needed to sync was a
new Makefile.am for installing docs as part of openssi-tools. To
discover that, however, I had to make sure the dramatic changes in
e2fsprogs and sysvinit were entirely due to upgrading of the base
versions of these packages.
To avoid anybody wasting time on this in the future, I propose that
anyone updating a base package first sync the other branch for that
package. For example, if I am upgrading the base RH version of
util-linux, I'll sync the Debian version of util-linux with the latest
SSI code for RH. Similarly, if Aneesh upgrades the base Debian version
of sysvinit, he'll sync the RH version of sysvinit with the latest SSI
code for Debian.
Of course, you should update the appropriate tag after syncing the other
branch and committing the upgraded code into your own branch. As a
reminder, MERGE-DEBIAN-RH is a tag on the OPENSSI-RH branch that marks
the last time the Debian branch was synced with the RH branch. The
MERGE-RH-DEBIAN is a tag on the OPENSSI-DEBIAN branch that marks the
last time the RH branch was synced with the Debian branch.
Does this make sense?