mirror of
https://salsa.debian.org/hertzog/debian-handbook.git
synced 2026-01-11 19:56:38 +00:00
Update README and scripts for Bookworm
This commit is contained in:
parent
7dbb624415
commit
7d18331589
3 changed files with 13 additions and 10 deletions
|
|
@ -15,18 +15,18 @@ How to merge from weblate
|
|||
If you don't have it configured, do it:
|
||||
$ git remote add weblate https://hosted.weblate.org/git/debian-handbook/12_advanced-administration
|
||||
|
||||
3. Checkout the bullseye/main branch from weblate in "weblate-merge":
|
||||
$ git checkout -B weblate-merge weblate/bullseye/main
|
||||
3. Checkout the bookworm/main branch from weblate in "weblate-merge":
|
||||
$ git checkout -B weblate-merge weblate/bookworm/main
|
||||
|
||||
4. Rebase it on top on bullseye/main and squash as many commits as
|
||||
4. Rebase it on top on bookworm/main and squash as many commits as
|
||||
possible. You can get a list of commands to feed by executing
|
||||
bin/merge-weblate
|
||||
$ bin/merge-weblate >/tmp/rebase-commands
|
||||
$ git rebase -i bullseye/main # feed content of /tmp/rebase-commands
|
||||
$ git rebase -i bookworm/main # feed content of /tmp/rebase-commands
|
||||
# instead of list provided by git
|
||||
|
||||
5. Switch back to bullseye/main and merge weblate-merge.
|
||||
$ git checkout bullseye/main
|
||||
5. Switch back to bookworm/main and merge weblate-merge.
|
||||
$ git checkout bookworm/main
|
||||
$ git merge weblate-merge
|
||||
|
||||
6. Run "bin/build-all". If some languages fail to build, find out why
|
||||
|
|
|
|||
|
|
@ -28,6 +28,9 @@ get_release() {
|
|||
11*)
|
||||
release="bullseye"
|
||||
;;
|
||||
12*)
|
||||
release="bookworm"
|
||||
;;
|
||||
*)
|
||||
echo "ERROR: unable to identify release for version $version" >&2
|
||||
exit 1
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
# This is a somewhat hackish script to help merge changes coming from weblate
|
||||
# You need to to the following:
|
||||
# 1- ensure "bullseye/main" is up-to-date
|
||||
# 1- ensure "bookworm/main" is up-to-date
|
||||
# 2- checkout the latest weblate commit in the "weblate-merge" branch
|
||||
# 2- run this script, copy its output
|
||||
# 3- run "git rebase -i bullseye/main" and replace the list of commands
|
||||
# 3- run "git rebase -i bookworm/main" and replace the list of commands
|
||||
# by those that you have copied before
|
||||
# 4- switch back to "bullseye/main" and merge weblate-merge
|
||||
# 4- switch back to "bookworm/main" and merge weblate-merge
|
||||
|
||||
gitlog = ["git", "log", "--stat", "--reverse",
|
||||
"--format=format:%h %ae %s",
|
||||
"bullseye/main..weblate-merge"]
|
||||
"bookworm/main..weblate-merge"]
|
||||
re_log = r"^([a-f0-9]+) (\S+) (.*)"
|
||||
|
||||
import re
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue