README for SIPB maintainers Basic instructions on scripts of interest. Also, How this repository is set up, and how to keep IkiWiki up to date. Setup: There are three branches of interest: remotes/origin/master, master and sipb. remotes/origin/master is the remote branch we are tracking; all upstream changes show up in this branch when we `git fetch`. master is our "awaiting upstream approval" branch, based off of remotes/origin/master. Any patches in this branch should be immediately suitable for submission to IkiWiki maintainers/. Ideally, this branch should be equivalent to remotes/origin/master. sipb is our live branch. It contains all of the ugly hacks and custom modifications that we needed to make our website run. Ideally, this branch is equivalent to master. Don't expect it to be without a lot of rearchitecting and upstream cooperation. Keeping up to date: XXX: This is what we'd do in our original clone of upstream. How do we do this now that we have our own internal repo to clone? This two-tiered setup means that you will need to rebase twice in order to propagate changes; possibly once if master == origin/master. Your commands will look like this: $ git checkout master $ git pull --rebase $ git checkout sipb $ git rebase master TODO: Make a script that does this. Scripts: The source repository has a hook that automatically deploys changes when you push to it. If bad things happen, however, there are two scripts of interest: ~/bin/reinstall-ikiwiki This script runs make and make install, reinstalling the source files to make it live. ~/bin/update-ikiwiki This script recompiles the website from its source directory ikiwiki/src into the live wiki directory web_scripts/wiki. Normally, these don't need to be run.