scripts/upstream-import.py REF commits an upstream release onto the upstream branch with the rename applied and formatted by rustfmt. The fork's own README, changelog, .gitignore and workflows replace upstream's, and upstream's release tooling is left out. Each snapshot's parent is the last one, so merging upstream into main brings in only upstream's changes, already renamed. --first starts the branch at the commit the fork was made from, and main records it once with git merge -s ours. Tags are fetched into refs/upstream-tags/.
.gitea/workflows/upstream-watch.yml runs daily from metadata only. It reads the last import from the upstream branch's head subject and opens an Import upstream vX.Y.Z issue for each newer release.
GitHub CI skips the upstream branch.
Tested in a scratch clone:
--first 486a384 reproduces the hand rename (#1), except for the added copyright lines and the CLI's about text.
Importing v1.0.13 and trial-merging into main leaves 8 conflicting files (29 hunks), all real overlaps such as export, JMAP requests and tests. That merge is the next PR.
The watch's release comparison against live data gives v1.0.12 and v1.0.13 after v1.0.11, and nothing after v1.0.13.
The upstream branch doesn't exist on origin yet. It gets pushed with the first import, and until then the watch fails.
Roadmap item 15: keeping up with upstream.
- `scripts/upstream-import.py REF` commits an upstream release onto the `upstream` branch with the rename applied and formatted by `rustfmt`. The fork's own README, changelog, `.gitignore` and workflows replace upstream's, and upstream's release tooling is left out. Each snapshot's parent is the last one, so merging `upstream` into main brings in only upstream's changes, already renamed. `--first` starts the branch at the commit the fork was made from, and main records it once with `git merge -s ours`. Tags are fetched into `refs/upstream-tags/`.
- `.gitea/workflows/upstream-watch.yml` runs daily from metadata only. It reads the last import from the `upstream` branch's head subject and opens an `Import upstream vX.Y.Z` issue for each newer release.
- GitHub CI skips the `upstream` branch.
Tested in a scratch clone:
- `--first 486a384` reproduces the hand rename (#1), except for the added copyright lines and the CLI's about text.
- Importing v1.0.13 and trial-merging into main leaves 8 conflicting files (29 hunks), all real overlaps such as export, JMAP requests and tests. That merge is the next PR.
- The watch's release comparison against live data gives v1.0.12 and v1.0.13 after v1.0.11, and nothing after v1.0.13.
The `upstream` branch doesn't exist on origin yet. It gets pushed with the first import, and until then the watch fails.
scripts/upstream-import.py commits an upstream release onto the
`upstream` branch with the fork's rename applied (rustfmt'd), the fork's
own README, changelog, .gitignore and workflows in place of upstream's, and
upstream's release tooling left out. Each snapshot's parent is the last, so
merging the branch into main brings in only what upstream changed, already
renamed. Upstream tags go to refs/upstream-tags/, never refs/tags/.
The upstream-watch workflow reads the imported release from the branch's
head subject and opens an "Import upstream vX.Y.Z" issue for each newer
release, daily, from metadata only. GitHub's CI skips the `upstream`
branch.
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
Roadmap item 15: keeping up with upstream.
scripts/upstream-import.py REFcommits an upstream release onto theupstreambranch with the rename applied and formatted byrustfmt. The fork's own README, changelog,.gitignoreand workflows replace upstream's, and upstream's release tooling is left out. Each snapshot's parent is the last one, so mergingupstreaminto main brings in only upstream's changes, already renamed.--firststarts the branch at the commit the fork was made from, and main records it once withgit merge -s ours. Tags are fetched intorefs/upstream-tags/..gitea/workflows/upstream-watch.ymlruns daily from metadata only. It reads the last import from theupstreambranch's head subject and opens anImport upstream vX.Y.Zissue for each newer release.upstreambranch.Tested in a scratch clone:
--first 486a384reproduces the hand rename (#1), except for the added copyright lines and the CLI's about text.The
upstreambranch doesn't exist on origin yet. It gets pushed with the first import, and until then the watch fails.