You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
git fetch svn master # retrieve the latest from SVN
150
+
git fetch svn main # retrieve the latest from SVN
151
151
```
152
152
153
153
If you've got the repo set up locally already, update:
154
154
155
155
```sh
156
-
git fetch svn master
156
+
git fetch svn main
157
157
git fetch weblate master
158
158
git reset --hard weblate/master # force-reset to match state on Weblate (usual caution with --hard applies)
159
159
```
@@ -182,7 +182,7 @@ The basic idea is to compare the Weblate repo (which copies the R subversion rep
182
182
}
183
183
184
184
weblate_summary <- po_counts(po_files())
185
-
set_branch('svn/master')
185
+
set_branch('svn/main')
186
186
svn_summary <- po_counts(po_files())
187
187
set_branch('master')
188
188
@@ -236,8 +236,8 @@ The basic idea is to compare the Weblate repo (which copies the R subversion rep
236
236
1. Generate a patch file from the diff, going back to the most recent commit with translations merged, e.g.
237
237
238
238
```sh
239
-
# NB: _not_ 'git diff weblate/master svn/master' since we've just deleted the empty .po files locally
240
-
git diff svn/master --no-prefix -- "*.po"
239
+
# NB: _not_ 'git diff weblate/master svn/main' since we've just deleted the empty .po files locally
240
+
git diff svn/main --no-prefix -- "*.po"
241
241
```
242
242
243
243
1. Share the patch file on the R Contributors Slack group's #core-translation channel and kindly ping @MichaelLawrence for his assistance on getting the patch file applied on the trunk of R dev to get it merged. We should do this ~once per quarter.
0 commit comments