Created
November 10, 2020 01:55
-
-
Save PhilHudson/48f4d851ec44df20c8d10b399402f2aa to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/usr/bin/env bash | |
# $1 (optional): triggering host | |
source "${HOME}/bin/sec-utils/agent.source.bash" | |
# Mainly called remotely, often from eshell, so 'less' messes things up | |
export PAGER=cat | |
# Pull changes from central repo into local repo | |
cd "$HOME/bzr_scm/dot" | |
bzr merge --remember --quiet "bzr+ssh://${1:-bzrhub}/~/bzr_scm/dot/" | |
bzr commit --quiet --message "Merge" | |
cd | |
# Pull changes from local repo into working checkout | |
bzr update --quiet | |
# Integrate changes and test | |
bzr conflicts | |
"${HOME}/bin/test-all" | |
"${HOME}/bin/on-merge.d/fortune-updated" | |
"${HOME}/bin/emacs-utils/byte-compile-outdated" | |
# Notify | |
gn "Completed merge from ${1:-bzrhub} to ${HOST}." "Merge complete" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment