HTCondor Project List Archives



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Condor-devel] 7.7.1 branched today



This is not actually an "otherwise,"  but I'll bet no one thought
about these tasks. . .

With src/doc in 1 repository, there are some extra items that
you have to add to your list when making a branch.

  1.  Update doc/Makefile to place the locally made html in
a properly named directory.  For this 7.7.1 branch, I think
that changes from 'ref-master' to ref-v771 .
  2.  When you merge this change to Makefile into master
branch, you'll either get a conflict, or the merge will proceed
without a conflict and will have brought an unwanted change
into master.  Go back into the Makefile and either undo the
incorrect change (locally made html goes into ref-master),
or wait for step 3 and make the change there.
  3.  On the parent branch (master, for this new branch),
    -- update Makefile  with new version number (7.7.2 this time)
       for variables SUBDIR and SUBVER.   Also correct LOCALDIR
       back to ref-master if you didn't do it as part of the merge.
    -- update condor-macros.text with new VersionNotice number
    -- update version-history/7.7.history.tex by adding new copy
       of file version-tmpl.tex to the right part of the file,
       and setting all relevant section headers and release date
       item to correct version number.
    --  spell check, make the manual to verify you didn't
       break anything, and check to make sure the version number
       comes out right and the new, empty version history is
       correct.