It is mostly my mistake. I now remember we ran into a similar
situation last time too. I will be careful next time.
BTW with respect to updating the merge tag I guess you can update the
tag without worrying about debian changes. There is no openssi
specific changes in the debian branch that you may want to merge back
to fedora branch. Gopal can corret me if am wrong. If i remember
correctly you should be able to update the merge-fc tag without
worrying about all those changes.
On Fri, 22 Oct 2004 15:38:07 -0700, Brian J. Watson
> Aneesh, Gopal, En Chiang, John, Bharata and anybody else for whom this
> While I'm working on finalizing the 1.1.1 release for FC2, I thought I'd
> make sure that it's completely synced with the recent changes for Debian
> and RH9. Guess again! The Debian branch was recently merged with new
> base code, so it would be a lot of work to separate those substantial
> changes (over 30,000 lines of diff!!) from anything OpenSSI-specific
> that I might need to sync to the FC branch.
> I'm going to assume that none of the recent changes on the
> OPENSSI-DEBIAN branch need to be synced to the -FC branch, and I'm going
> to update the MERGE-FC-DB tag to the top of the OPENSSI-DEBIAN branch.
> Aneesh and Gopal, you can correct me if I'm wrong. Just in case I am
> wrong, I'll set a MERGE-FC-DB-SAV tag at the previous location of the
> MERGE-FC-DB tag.
> To avoid this in the future, we should follow this procedure:
> 1) Before merging new base code, first let the other distro maintainers
> sync your recent OpenSSI changes. If you're merging new Debian or RH9
> code, only the FC branch needs to sync your changes, since it's the
> "clearinghouse" for syncing. If you're merging new FC code, however,
> both the Debian and RH maintainers need to sync with FC.
> 2) Once this is done, the MERGE tags for the other distros should now be
> at the top of your branch. For example, if you want to merge new Debian
> base code, the MERGE-FC-DB tag should now be at the top of the
> OPENSSI-DEBIAN branch. If it's FC2 you're working on, both the
> MERGE-DB-FC and MERGE-RH-FC tags should now be at the top of the
> OPENSSI-FC branch.
> 3) Merge with your new base code.
> 4) Update the MERGE tags for the other distros (`cvs -q tag -F
> MERGE...'), so that they're once again at the top of your branch. See
> step 2 for examples.
> If you don't understand what I'm saying and this e-mail is explicitly
> addressed to you, please let me know. I'll clarify any confusing points
> for you.
> Also, let me know if you have any suggestions for improvement to this