# # # patch "build.sh" # from [f6a93db53ff5933b740a72c00fa9153b81a64e5e] # to [97fe3bb5dd1fae31792ee28fa8f67539f00e12c6] # ============================================================ --- build.sh f6a93db53ff5933b740a72c00fa9153b81a64e5e +++ build.sh 97fe3bb5dd1fae31792ee28fa8f67539f00e12c6 @@ -5,16 +5,17 @@ WIKI_URL="http://wiki.monotone.ca" ### begin configuration BRANCH="net.venge.monotone.web.ikiwiki" WIKI_URL="http://wiki.monotone.ca" -PULL_URL="mtn://code.monotone.ca/monotone-web?$BRANCH" +SYNC_URL="mtn://code.monotone.ca/monotone-web?$BRANCH" HISTORY_URL="http://code.monotone.ca/p/monotone-web/source/changes/h:$BRANCH/" ### end configuration alias mtn="mtn -q --confdir ." if [ -e _MTN ]; then - echo "> pulling and merging changes" - mtn pull "$PULL_URL" + echo "> syncing and merging changes" + mtn pull "$SYNC_URL" mtn merge -b "$BRANCH" + mtn push "$SYNC_URL" mtn update -r "h:$BRANCH" fi