#
#
# patch "build.sh"
#  from [2648f535a5482cf32580f2a258a6e6c8095ec94b]
#    to [c5894d7d641c1654ad916d3aaf0e302f954061f9]
#
============================================================
--- build.sh	2648f535a5482cf32580f2a258a6e6c8095ec94b
+++ build.sh	c5894d7d641c1654ad916d3aaf0e302f954061f9
@@ -1,11 +1,28 @@
 #!/bin/sh
 
-WIKI_URL=http://wiki.monotone.ca
-HISTORY_URL=http://code.monotone.ca/p/monotone-web/source/changes/h:net.venge.monotone.web/
+set -e
 
+### begin configuration
+BRANCH="net.venge.monotone.web.ikiwiki"
+WIKI_URL="http://wiki.monotone.ca"
+PULL_URL="mtn://code.monotone.ca/monotone-web?$BRANCH"
+HISTORY_URL="http://code.monotone.ca/p/monotone-web/source/changes/h:$BRANCH/"
+MTN_CALL="/opt/local/bin/mtn -q --confdir ."
+### end configuration
+
+if [ -e _MTN ]; then
+    echo "> pulling and merging changes"
+    $MTN_CALL pull "$PULL_URL"
+    $MTN_CALL merge -b "$BRANCH"
+    $MTN_CALL update -r "h:$BRANCH"
+fi
+
+echo "> rebuilding wiki"
 rm -rf compiled
 ikiwiki --wikiname monotone --plugin rawhtml --plugin goodstuff \
     --plugin graphviz --plugin table --plugin search \
     --url $WIKI_URL --cgiurl $WIKI_URL/ikiwiki.cgi --underlaydir underlay \
     --historyurl $HISTORY_URL --no-usedirs --rebuild \
     wiki compiled
+
+echo "done"