Den sön 3 apr. 2022 kl 16:35 skrev Mark Phippard <markp...@gmail.com>:
> I've not done much to the website in years and want to understand the > current process. > > I believe all changes should be made to staging and then merged to publish? > > I am OK with this but it seems mildly difficult to manage the merges > with concurrent development that is happening. Is there any reason > that I, or someone else, cannot sync the branches now so that a future > merge for the releases is easier? > > svn merge ^/subversion/site/staging . > --- Merging r1897773 through r1898164 into '.': > G index.html > G news.html > G roadmap.html > U upcoming.part.html > A docs/release-notes/1.15.html > U docs/release-notes/index.html > G . > --- Merging r1898165 through r1898168 into '.': > U docs/release-notes/1.15.html > --- Merging r1898169 through r1898183 into '.': > U docs/release-notes/1.10.html > U docs/release-notes/1.11.html > U docs/release-notes/1.12.html > U docs/release-notes/1.13.html > U docs/release-notes/1.14.html > U docs/release-notes/1.7.html > U docs/release-notes/1.9.html > G docs/release-notes/1.15.html > U docs/release-notes/1.8.html > --- Merging r1898977 through r1899002 into '.': > G docs/release-notes/1.15.html > --- Merging r1899003 through r1899183 into '.': > G docs/release-notes/1.15.html > --- Merging r1899184 through r1899186 into '.': > A docs/i525-user-guide.html > G docs/release-notes/1.15.html > --- Merging r1899346 through r1899535 into '.': > U docs/community-guide/roles.part.html > U docs/community-guide/releasing.part.html > G docs/release-notes/1.8.html > --- Recording mergeinfo for merge of r1812683 through r1899535 into '.': > U . > --- Recording mergeinfo for merge of r1812683 through r1899535 into > 'index.html': > U index.html > --- Recording mergeinfo for merge of r1812683 through r1899535 into > 'news.html': > U news.html > --- Recording mergeinfo for merge of r1812683 through r1899535 into > 'roadmap.html': > U roadmap.html > ❯ svn st > M . > M docs/community-guide/releasing.part.html > M docs/community-guide/roles.part.html > A + docs/i525-user-guide.html > M docs/release-notes/1.10.html > M docs/release-notes/1.11.html > M docs/release-notes/1.12.html > M docs/release-notes/1.13.html > M docs/release-notes/1.14.html > A + docs/release-notes/1.15.html > M docs/release-notes/1.7.html > M docs/release-notes/1.8.html > M docs/release-notes/1.9.html > M docs/release-notes/index.html > M index.html > M news.html > M roadmap.html > M upcoming.part.html > > Looking at the diff, it seemed to be mainly the addition of the 1.15 > release notes and then a bunch of grammar changes in older release > notes. > > We have certainly had work in progress release notes on our main site > in the past. > Thank you for your hard work with the release! I'm in the middle of the process of testing, however I have some trouble with the gpg keys and I'm not sure I'll be able to sign, but I to at least be able to report my progress on the mailing list. Lately it has mostly been Nathan and me updating the website.. Process has normally been to add things to staging and then after review (or soak) merge to publish. There has also been some changes done directly in publish, generally simple things, and once in a while catchup merged to staging. As you have seen yourself there are a bunch of 1.15 updates that really doesn't qualify to merge yet. For this reason I'd suggest to edit publish directly in this instance. If unsure, send a patch to the list and I can review it. /Daniel
