ssh_bzr_merge.bash

#!/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"