Ryan May wrote:
John Hunter wrote:
Do the online docs automatically update themselves from changes in SVN? I
thought there was a nightly cron. I made some changes a few days ago (just a few
typos) and they haven't shown up online yet. The changes were to
doc/users/shell.rst. I'm assuming I should see the corresponding changes on
I had them in a cron and voluntarily disabled it. I'm amenable to
re-enabling it. The problem is that as examples become available in
svn, they automatically get pushed out to the gallery, but these may
not run on the latest released version. I thought perhaps the site
should more closely track the latest released version, so the last few
times I've pushed the docs out, I did so from the branch. So if you
want to see doc changes get pushed out sooner, you should patch the
branch and merge to the trunk. I am in general a big fan of
encouraging people to use the svn snapshots as much as possible, and
updating the gallery and site docs nightly helps this because the new
features in the gallery entice them, but in the absence of nightly
builds and snapshots I don't think this is too helpful.
Is there any way to merge changes done on the trunk onto the branch? Or should I
just do it manually?
I could set up merging from trunk to branch, but I'd like to discourage that in general. While we generally want all relevant changes merged from the branch to the trunk, that is not true in reverse (many things on the trunk are too risky to go to the branch). So, you end up doing a lot of manual cherry-picking when going in that direction, making svnmerge less helpful anyway.
Generally, if I forget to do something on the branch, I just do an SVN diff of what I did to the trunk, use that to patch my working copy of the branch, and then commit the branch.
On Tue, Jan 27, 2009 at 3:33 PM, Ryan May <rmay31@...149...> wrote:
Science Software Branch
Operations and Engineering Division
Space Telescope Science Institute
Operated by AURA for NASA