Skip to content

Commit b26a4f6

Browse files
Merge pull request #49 from r-devel/svn-default-branch
r-devel/r-svn renamed default branch
2 parents a9c7777 + 94e22f0 commit b26a4f6

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

web/Weblate-server.qmd

+5-5
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,13 @@ The basic idea is to compare the Weblate repo (which copies the R subversion rep
147147
```sh
148148
git clone -o weblate https://translate.rx.studio/git/r-project/base-r-gui/ # remote #1: Weblate source
149149
git remote add svn [email protected]:r-devel/r-svn.git # remote #2: SVN source
150-
git fetch svn master # retrieve the latest from SVN
150+
git fetch svn main # retrieve the latest from SVN
151151
```
152152

153153
If you've got the repo set up locally already, update:
154154

155155
```sh
156-
git fetch svn master
156+
git fetch svn main
157157
git fetch weblate master
158158
git reset --hard weblate/master # force-reset to match state on Weblate (usual caution with --hard applies)
159159
```
@@ -182,7 +182,7 @@ The basic idea is to compare the Weblate repo (which copies the R subversion rep
182182
}
183183
184184
weblate_summary <- po_counts(po_files())
185-
set_branch('svn/master')
185+
set_branch('svn/main')
186186
svn_summary <- po_counts(po_files())
187187
set_branch('master')
188188
@@ -236,8 +236,8 @@ The basic idea is to compare the Weblate repo (which copies the R subversion rep
236236
1. Generate a patch file from the diff, going back to the most recent commit with translations merged, e.g.
237237

238238
```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"
241241
```
242242

243243
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

Comments
 (0)