-------- Forwarded Message -------- Subject: Steps for updating p5subset.xml in Stylesheets repo Date: Fri, 7 Aug 2020 08:41:32 -0700 From: Martin Holmes To: Syd Bauman CC: Martin Holmes This is an outline of the process we designed for updating the local copy of p5subset.xml in the Stylesheets. The rationale for this process is that changes to P5 inevitably require changes to the Stylesheets, but it makes more sense to deal with those required changes in batches, periodically, rather than making every change to P5 trigger frantic work on the Stylesheets (which the P5 ticket implementer may not be able to undertake at the time). The Stylesheets Group should probably undertake this work, and it must happen in a timely manner before any release. This is how it goes: 1. Retrieve a fresh copy of p5subset.xml, built using the current dev branch of P5. 2. In the Stylesheets, switch to the dev branch and git pull. Switch to the subsetSetup branch, which is intended for this work, and git pull. 3. Merge any changes from the Stylesheets dev branch into the subsetSetup branch. 4. Replace the p5subset.xml in the subsetSetup branch with the fresh one. 5. Run the Stylesheets tests (Test and Test2) in the subsetSetup branch. 6. Fix any problems. 7. Commit changes to subsetSetup branch. git push. 8. Switch back to the dev branch, git pull, and merge changes. git push. 9. Watch Mr Jenkins to make sure all is well. -- ------------------------------------- Humanities Computing and Media Centre University of Victoria mholmes@uvic.ca