Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
#!/usr/bin/env bash set -Eeuxo pipefail function merge() { id="$1"; title="$2" git pull --no-ff --no-commit --strategy-option 'theirs' 'openSUSE' "pull/$id/head" git commit --message "Merge #$id \"$title\"" items+=( "- [ ] $title [#$id](https://github.com/openSUSE/osem/pull/$id)" ) } function merge_draft() { branch="$1"; title="$2" git pull --no-ff --no-commit --strategy-option 'theirs' 'AndrewKvalheim' "$branch" git commit --message "Merge draft AndrewKvalheim:$branch" items+=( "- [ ] $title [\`$branch\`](https://github.com/AndrewKvalheim/osem/tree/$branch)" ) } function pick() { hash="$1"; title="$2" git cherry-pick "$hash" rebased="$(git rev-parse HEAD)" items+=( "- [ ] $title [\`${rebased:0:7}\`]($rebased)" ) } function revert() { hash="$1"; title="$2"; note="$3" git revert --no-edit "$hash" items+=( "- [ ] Revert “$title” [\`${hash:0:7}\`](openSUSE@$hash) ($note)" ) } items=() git fetch --prune 'openSUSE' git checkout 'interim' git reset --hard 'openSUSE/master' merge '2654' 'Fix access to the version history of organization-level roles' merge '3059' 'Add setting to disable email notifications of comments' merge '3058' 'Add surveys during CFP response' merge '3140' 'Don’t automatically select a difficulty level' merge '3243' 'Corrections to proposal help text' merge '3244' 'Resolve inability to schedule events' merge '3330' 'Fix bug in naming of Sentry release' merge_draft 'hide-commercials' 'Restrict commercial management to organizers' pick '9cac6fdc9c679590c42eb285ab50af54fabe32e6' 'Add notifications of user registrations' pick 'a5b5bf19f57176aca120072e5df14e198f4e4630' 'Configure deployment to Dokku' pick 'f9702d3909b46489b0ce3f6e96d7aa4c80932769' 'Work around [titusfortner/webdrivers#''254](https://github.com/titusfortner/webdrivers/issues/''254)' IFS=$'\n' cat << MARKDOWN > 'README.md' # About this branch Our goal is to run [upstream] OSEM without modifications to its codebase. We currently still make a few modifications in this interim branch: ${items[*]} These divergences from upstream should be seen as a to-do list, where completing an item means either solving its need in a general way upstream, or adjusting our procedures to accommodate upstream’s existing capabilities or limitations. ## Guidelines Don’t develop on this branch. It follows upstream by regularly **rebasing** the above modifications. When a modification is no longer necessary, it will be dropped during the rebase. When there are no remaining modifications, this branch will be deleted. [upstream]: https://github.com/openSUSE/osem MARKDOWN git add 'README.md' git commit --message "Document interim branch $(cat "${BASH_SOURCE[0]}")" git --no-pager log --color --oneline 'openSUSE/master'..'interim'
- Loading branch information