| Here it is assumed that most everything changed since the last release
go into this release, and HEAD has raced forward. Here is where the
merge point comes into use.
cd head, cvs diff -rOPENLDAP_REL_ENG_2_4_MP -r1
is everything that's changed since the release.
So, we can do:
cd re24, cvs upd -jOPENLDAP_REL_ENG_2_4_MP -j1
to such this all into re24. Note that if this is not the first
subsequent release, this will result in merge conflicts due to
our use of $OpenLDAP$ in sources files. I just edit all these conflicts
away. Don't use -kkv, it will leave the tags unexpanded in
Note that cvs upd is pretty smart, it will add/delete files in
the branch that were added/deleted since the merge. But it cannot
otherwise determine that a file left off the prior release is
now desired, or that new file in head is not desired in the
release branch. So some work here and there may be needed.
When ready for release, update CHANGES and versions.var, lay
the release tag (see above), and update the merge point.
Again, if merging spans an extended period, updating the merge
point mid process can be useful.
Notify the foundation when ready.