From 5341c4355f06ae865db13ac6f972aea470aa063c Mon Sep 17 00:00:00 2001 From: Michael Chirico Date: Mon, 18 Mar 2024 16:57:59 -0700 Subject: [PATCH] Spell out the steps for a re-run too --- web/Weblate-server.qmd | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/web/Weblate-server.qmd b/web/Weblate-server.qmd index bccb259..a19c382 100644 --- a/web/Weblate-server.qmd +++ b/web/Weblate-server.qmd @@ -142,7 +142,7 @@ _NB: Weblate links below assume you're logged in there, otherwise you'll be redi The basic idea is to compare the Weblate repo (which copies the R subversion repo, but also adds translations provided _via_ Weblate) to the "official" R sources; any difference in .po files should be submitted as a patch. 1. Make sure the Weblate repo is fully up-to-date. Check status at https://translate.rx.studio/projects/r-project/#repository -- be sure there are no `Update` or `Commit` actions needed. -1. Get the two repos cloned on any machine: +1. Get the two repos cloned on any machine. If this is your first time generating a patch on this machine: ```sh git clone -o weblate https://translate.rx.studio/git/r-project/base-r-gui/ # remote #1: Weblate source @@ -150,6 +150,14 @@ The basic idea is to compare the Weblate repo (which copies the R subversion rep git fetch svn master # retrieve the latest from SVN ``` + If you've got the repo set up locally already, update: + + ```sh + git fetch svn master + git fetch weblate master + git reset --hard weblate/master # force-reset to match state on Weblate (usual caution with --hard applies) + ``` + 1. Revert unwanted changes to reduce noise, e.g. something like: ```r