miles@P64:~/Projects/ubuntu-africa/trunk$ bzr up
+N  .doit.db                                                                                  
+N  README.rst
+N  cache/
+N  cache/.mako.tmp/
+N  cache/.mako.tmp/annotation_helper.tmpl.py
+N  cache/.mako.tmp/base.tmpl.py
+N  cache/.mako.tmp/base_helper.tmpl.py
+N  cache/.mako.tmp/comments_helper.tmpl.py
+N  cache/.mako.tmp/crumbs.tmpl.py
+N  cache/.mako.tmp/disqus_helper.tmpl.py
+N  cache/.mako.tmp/gallery.tmpl.py
+N  cache/.mako.tmp/googleplus_helper.tmpl.py
+N  cache/.mako.tmp/index.tmpl.py
+N  cache/.mako.tmp/index_helper.tmpl.py
+N  cache/.mako.tmp/intensedebate_helper.tmpl.py
+N  cache/.mako.tmp/list.tmpl.py
+N  cache/.mako.tmp/listing.tmpl.py
+N  cache/.mako.tmp/livefyre_helper.tmpl.py
+N  cache/.mako.tmp/moot_helper.tmpl.py
+N  cache/.mako.tmp/tags.tmpl.py
+N  cache/pages/
+N  cache/pages/bazaar-tutorial.html
+N  cache/pages/getting-involved.html
+N  cache/pages/index.html
+N  cache/pages/irc.html
+N  cache/webassets/
+N  cache/webassets/799bd7f1c8bd2cf07002552cb5effdf6
+N  cache/webassets/7e9a6b30623f4d00c99219ed023353ff
+N  cache/webassets/9ce5194d04001dce135b5f1f7c180ff5
+N  cache/webassets/a18672ab1fe3a9324ef4042d11c66e49
+N  cache/webassets/ae0047d98e9b04c65670d0b62ba4351a
+N  cache/webassets/c6b8d315cece3cdc38433e696f1fa346
+N  cache/webassets/d850f1d3759a91889b17e528809187c0
+N  cache/webassets/e0eff05b97d559892f354554aef2b9f1
+N  files/community-140x140.png
+N  files/favicon.ico
+N  files/logo-background.png
+N  files/logo.png
+N  files/logo_14x14.png
+N  files/logo_16x16.png
+N  files/logo_192x192.png
+N  files/logo_64x64.png
+N  files/ubuntu-logo-140x140.png
+N  files/za-flag-140x140.png
+N  galleries/.directory
+N  listings/.directory
+N  output/
+N  output/archive.html
+N  output/assets/
+N  output/assets/css/
+N  output/assets/css/all-nocdn.css
+N  output/assets/css/all.css
+N  output/assets/css/bootstrap-responsive.css
+N  output/assets/css/bootstrap-responsive.min.css
+N  output/assets/css/bootstrap.css
+N  output/assets/css/bootstrap.min.css
+N  output/assets/css/code.css
+N  output/assets/css/colorbox.css
+N  output/assets/css/images/
+N  output/assets/css/images/border.png
+N  output/assets/css/images/controls.png
+N  output/assets/css/images/ie6/
+N  output/assets/css/images/loading.gif
+N  output/assets/css/images/loading_background.png
+N  output/assets/css/images/overlay.png
+N  output/assets/css/rst.css
+N  output/assets/css/theme.css
+N  output/assets/fonts/
+N  output/assets/img/
+N  output/assets/img/glyphicons-halflings-white.png
+N  output/assets/img/glyphicons-halflings.png
+N  output/assets/js/
+N  output/assets/js/all-nocdn.js
+N  output/assets/js/all.js
+N  output/assets/js/bootstrap.js
+N  output/assets/js/bootstrap.min.js
+N  output/assets/js/flowr.plugin.js
+N  output/assets/js/imagesloaded.pkgd.min.js
+N  output/assets/js/jquery.colorbox-min.js
+N  output/assets/js/jquery.min.js
+N  output/assets/js/mathjax.js
+N  output/categories/
+N  output/categories/index.html
+N  output/community-140x140.png
+N  output/favicon.ico
+N  output/galleries/
+N  output/galleries/index.html
+N  output/galleries/rss.xml
+N  output/index.html
+N  output/listings/
+N  output/listings/index.html
+N  output/logo-background.png
+N  output/logo.png
+N  output/logo_14x14.png
+N  output/logo_16x16.png
+N  output/logo_192x192.png
+N  output/logo_64x64.png
+N  output/output/
+N  output/output/archive.html
+N  output/output/assets/
+N  output/output/assets/css/
+N  output/output/assets/css/all-nocdn.css
+N  output/output/assets/css/all.css
+N  output/output/assets/css/bootstrap-responsive.css
+N  output/output/assets/css/bootstrap-responsive.min.css
+N  output/output/assets/css/bootstrap-theme.css
+N  output/output/assets/css/bootstrap-theme.css.map
+N  output/output/assets/css/bootstrap-theme.min.css
+N  output/output/assets/css/bootstrap.css
+N  output/output/assets/css/bootstrap.css.map
+N  output/output/assets/css/bootstrap.min.css
+N  output/output/assets/css/code.css
+N  output/output/assets/css/colorbox.css
+N  output/output/assets/css/docs.css
+N  output/output/assets/css/images/
+N  output/output/assets/css/images/border.png
+N  output/output/assets/css/images/controls.png
+N  output/output/assets/css/images/ie6/
+N  output/output/assets/css/images/ie6/borderBottomCenter.png
+N  output/output/assets/css/images/ie6/borderBottomLeft.png
+N  output/output/assets/css/images/ie6/borderBottomRight.png
+N  output/output/assets/css/images/ie6/borderMiddleLeft.png
+N  output/output/assets/css/images/ie6/borderMiddleRight.png
+N  output/output/assets/css/images/ie6/borderTopCenter.png
+N  output/output/assets/css/images/ie6/borderTopLeft.png
+N  output/output/assets/css/images/ie6/borderTopRight.png
+N  output/output/assets/css/images/loading.gif
+N  output/output/assets/css/images/loading_background.png
+N  output/output/assets/css/images/overlay.png
+N  output/output/assets/css/rst.css
+N  output/output/assets/css/theme.css
+N  output/output/assets/fonts/
+N  output/output/assets/fonts/glyphicons-halflings-regular.eot
+N  output/output/assets/fonts/glyphicons-halflings-regular.svg
+N  output/output/assets/fonts/glyphicons-halflings-regular.ttf
+N  output/output/assets/fonts/glyphicons-halflings-regular.woff
+N  output/output/assets/img/
+N  output/output/assets/img/glyphicons-halflings-white.png
+N  output/output/assets/img/glyphicons-halflings.png
+N  output/output/assets/js/
+N  output/output/assets/js/all-nocdn.js
+N  output/output/assets/js/all.js
+N  output/output/assets/js/bootstrap.js
+N  output/output/assets/js/bootstrap.min.js
+N  output/output/assets/js/colorbox-i18n/
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-ar.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-bg.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-ca.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-cs.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-da.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-de.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-es.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-et.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-fa.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-fi.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-fr.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-gl.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-gr.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-he.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-hr.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-hu.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-id.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-it.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-ja.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-kr.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-lt.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-lv.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-my.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-nl.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-no.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-pl.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-pt-br.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-ro.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-ru.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-si.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-sk.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-sr.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-sv.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-tr.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-uk.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js
+N  output/output/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js
+N  output/output/assets/js/fancydates.js
+N  output/output/assets/js/flowr.plugin.js
+N  output/output/assets/js/html5.js
+N  output/output/assets/js/imagesloaded.pkgd.min.js
+N  output/output/assets/js/jquery.colorbox-min.js
+N  output/output/assets/js/jquery.colorbox.js
+N  output/output/assets/js/jquery.min.js
+N  output/output/assets/js/jquery.min.map
+N  output/output/assets/js/mathjax.js
+N  output/output/assets/js/moment-with-locales.min.js
+N  output/output/assets/xml/
+N  output/output/assets/xml/rss.xsl
+N  output/output/bazaar-tutorial.html
+N  output/output/blog/
+N  output/output/blog/index.html
+N  output/output/categories/
+N  output/output/categories/index.html
+N  output/output/community-140x140.png
+N  output/output/favicon.ico
+N  output/output/galleries/
+N  output/output/galleries/index.html
+N  output/output/galleries/rss.xml
+N  output/output/getting-involved.html
+N  output/output/index.html
+N  output/output/irc.html
+N  output/output/listings/
+N  output/output/listings/.directory.html
+N  output/output/listings/index.html
+N  output/output/logo-background.png
+N  output/output/logo.png
+N  output/output/logo_14x14.png
+N  output/output/logo_16x16.png
+N  output/output/logo_192x192.png
+N  output/output/logo_64x64.png
+N  output/output/robots.txt
+N  output/output/rss.xml
+N  output/output/sitemap.xml
+N  output/output/sitemapindex.xml
+N  output/output/ubuntu-logo-140x140.png
+N  output/output/za-flag-140x140.png
+N  output/rss.xml
+N  output/sitemap.xml
+N  output/ubuntu-logo-140x140.png
+N  output/za-flag-140x140.png
+N  pages/
+N  pages/bazaar-tutorial.rst
+N  pages/getting-involved.rst
+N  pages/index.rst
+N  pages/irc.rst
+N  themes/
+N  themes/bootstrap3/
+N  themes/bootstrap3/README.md
+N  themes/bootstrap3/assets/
+N  themes/bootstrap3/assets/css/
+N  themes/bootstrap3/assets/css/bootstrap-theme.css
+N  themes/bootstrap3/assets/css/bootstrap-theme.css.map
+N  themes/bootstrap3/assets/css/bootstrap-theme.min.css
+N  themes/bootstrap3/assets/css/bootstrap.css
+N  themes/bootstrap3/assets/css/bootstrap.css.map
+N  themes/bootstrap3/assets/css/bootstrap.min.css
+N  themes/bootstrap3/assets/css/docs.css
+N  themes/bootstrap3/assets/css/images/
+N  themes/bootstrap3/assets/css/images/ie6/
+N  themes/bootstrap3/assets/css/images/ie6/borderBottomCenter.png
+N  themes/bootstrap3/assets/css/images/ie6/borderBottomLeft.png
+N  themes/bootstrap3/assets/css/images/ie6/borderBottomRight.png
+N  themes/bootstrap3/assets/css/images/ie6/borderMiddleLeft.png
+N  themes/bootstrap3/assets/css/images/ie6/borderMiddleRight.png
+N  themes/bootstrap3/assets/css/images/ie6/borderTopCenter.png
+N  themes/bootstrap3/assets/css/images/ie6/borderTopLeft.png
+N  themes/bootstrap3/assets/css/images/ie6/borderTopRight.png
+N  themes/bootstrap3/assets/css/rst.css
+N  themes/bootstrap3/assets/css/theme.css
+N  themes/bootstrap3/assets/fonts/
+N  themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.eot
+N  themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.svg
+N  themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.ttf
+N  themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.woff
+N  themes/bootstrap3/assets/js/
+N  themes/bootstrap3/assets/js/bootstrap.js
+N  themes/bootstrap3/assets/js/bootstrap.min.js
+N  themes/bootstrap3/bundles
+N  themes/bootstrap3/engine
+N  themes/bootstrap3/parent
+N  themes/bootstrap3/templates/
+N  themes/bootstrap3/templates/base.tmpl
+N  themes/bootstrap3/templates/base_helper.tmpl
+N  themes/bootstrap3/templates/gallery.tmpl
+N  themes/bootstrap3/templates/listing.tmpl
+N  themes/bootstrap3/templates/slides.tmpl
+N  themes/ubuntuza/
+N  themes/ubuntuza/assets/
+N  themes/ubuntuza/assets/css/
+N  themes/ubuntuza/assets/css/bootstrap-theme.css
+N  themes/ubuntuza/assets/css/bootstrap-theme.min.css
+N  themes/ubuntuza/assets/css/bootstrap.css
+N  themes/ubuntuza/assets/css/bootstrap.min.css
+N  themes/ubuntuza/assets/css/theme.css
+N  themes/ubuntuza/parent
+N  themes/ubuntuza/templates/
+N  themes/ubuntuza/templates/base.tmpl
All changes applied successfully.                                                             
Updated to revision 4 of branch bzr+ssh://bazaar.launchpad.net/+branch/ubuntu-africa
miles@P64:~/Projects/ubuntu-africa/trunk$ bzr merge lp:~inetpro/ubuntu-africa/fixbase
+N  .bzrignore                                                                                
-D  .doit.db
RM  cache/.mako.tmp/annotation_helper.tmpl.py => cache/.mako.tmp/annotation_helper.tmpl.py.THIS
RM  cache/.mako.tmp/base.tmpl.py => cache/.mako.tmp/base.tmpl.py.THIS
RM  cache/.mako.tmp/base_helper.tmpl.py => cache/.mako.tmp/base_helper.tmpl.py.THIS
RM  cache/.mako.tmp/comments_helper.tmpl.py => cache/.mako.tmp/comments_helper.tmpl.py.THIS
RM  cache/.mako.tmp/crumbs.tmpl.py => cache/.mako.tmp/crumbs.tmpl.py.THIS
RM  cache/.mako.tmp/disqus_helper.tmpl.py => cache/.mako.tmp/disqus_helper.tmpl.py.THIS
RM  cache/.mako.tmp/gallery.tmpl.py => cache/.mako.tmp/gallery.tmpl.py.THIS
RM  cache/.mako.tmp/googleplus_helper.tmpl.py => cache/.mako.tmp/googleplus_helper.tmpl.py.THIS
RM  cache/.mako.tmp/index.tmpl.py => cache/.mako.tmp/index.tmpl.py.THIS
RM  cache/.mako.tmp/index_helper.tmpl.py => cache/.mako.tmp/index_helper.tmpl.py.THIS
RM  cache/.mako.tmp/intensedebate_helper.tmpl.py => cache/.mako.tmp/intensedebate_helper.tmpl.py.THIS
RM  cache/.mako.tmp/list.tmpl.py => cache/.mako.tmp/list.tmpl.py.THIS
RM  cache/.mako.tmp/listing.tmpl.py => cache/.mako.tmp/listing.tmpl.py.THIS
RM  cache/.mako.tmp/livefyre_helper.tmpl.py => cache/.mako.tmp/livefyre_helper.tmpl.py.THIS
RM  cache/.mako.tmp/moot_helper.tmpl.py => cache/.mako.tmp/moot_helper.tmpl.py.THIS
RM  cache/.mako.tmp/tags.tmpl.py => cache/.mako.tmp/tags.tmpl.py.THIS
-D  cache/pages/
-D  cache/pages/bazaar-tutorial.html
-D  cache/pages/getting-involved.html
-D  cache/pages/index.html
-D  cache/pages/irc.html
-D  cache/webassets/
-D  cache/webassets/799bd7f1c8bd2cf07002552cb5effdf6
-D  cache/webassets/7e9a6b30623f4d00c99219ed023353ff
-D  cache/webassets/9ce5194d04001dce135b5f1f7c180ff5
-D  cache/webassets/a18672ab1fe3a9324ef4042d11c66e49
-D  cache/webassets/ae0047d98e9b04c65670d0b62ba4351a
-D  cache/webassets/c6b8d315cece3cdc38433e696f1fa346
-D  cache/webassets/d850f1d3759a91889b17e528809187c0
-D  cache/webassets/e0eff05b97d559892f354554aef2b9f1
 M  conf.py
-D  output/
-D  output/archive.html
-D  output/assets/
-D  output/assets/css/
-D  output/assets/css/all-nocdn.css
-D  output/assets/css/all.css
-D  output/assets/css/bootstrap-responsive.css
-D  output/assets/css/bootstrap-responsive.min.css
-D  output/assets/css/bootstrap.css
-D  output/assets/css/bootstrap.min.css
-D  output/assets/css/code.css
-D  output/assets/css/colorbox.css
-D  output/assets/css/images/
-D  output/assets/css/images/border.png
-D  output/assets/css/images/controls.png
-D  output/assets/css/images/ie6/
-D  output/assets/css/images/loading.gif
-D  output/assets/css/images/loading_background.png
-D  output/assets/css/images/overlay.png
-D  output/assets/css/rst.css
-D  output/assets/css/theme.css
-D  output/assets/fonts/
-D  output/assets/img/
-D  output/assets/img/glyphicons-halflings-white.png
-D  output/assets/img/glyphicons-halflings.png
-D  output/assets/js/
-D  output/assets/js/all-nocdn.js
-D  output/assets/js/all.js
-D  output/assets/js/bootstrap.js
-D  output/assets/js/bootstrap.min.js
-D  output/assets/js/flowr.plugin.js
-D  output/assets/js/imagesloaded.pkgd.min.js
-D  output/assets/js/jquery.colorbox-min.js
-D  output/assets/js/jquery.min.js
-D  output/assets/js/mathjax.js
-D  output/categories/
-D  output/categories/index.html
-D  output/community-140x140.png
-D  output/favicon.ico
-D  output/galleries/
-D  output/galleries/index.html
-D  output/galleries/rss.xml
-D  output/index.html
-D  output/listings/
-D  output/listings/index.html
-D  output/logo-background.png
-D  output/logo.png
-D  output/logo_14x14.png
-D  output/logo_16x16.png
-D  output/logo_192x192.png
-D  output/logo_64x64.png
-D  output/output/
-D  output/output/archive.html
-D  output/output/assets/
-D  output/output/assets/css/
-D  output/output/assets/css/all-nocdn.css
-D  output/output/assets/css/all.css
-D  output/output/assets/css/bootstrap-responsive.css
-D  output/output/assets/css/bootstrap-responsive.min.css
-D  output/output/assets/css/bootstrap-theme.css
-D  output/output/assets/css/bootstrap-theme.css.map
-D  output/output/assets/css/bootstrap-theme.min.css
-D  output/output/assets/css/bootstrap.css
-D  output/output/assets/css/bootstrap.css.map
-D  output/output/assets/css/bootstrap.min.css
-D  output/output/assets/css/code.css
-D  output/output/assets/css/colorbox.css
-D  output/output/assets/css/docs.css
-D  output/output/assets/css/images/
-D  output/output/assets/css/images/border.png
-D  output/output/assets/css/images/controls.png
-D  output/output/assets/css/images/ie6/
-D  output/output/assets/css/images/ie6/borderBottomCenter.png
-D  output/output/assets/css/images/ie6/borderBottomLeft.png
-D  output/output/assets/css/images/ie6/borderBottomRight.png
-D  output/output/assets/css/images/ie6/borderMiddleLeft.png
-D  output/output/assets/css/images/ie6/borderMiddleRight.png
-D  output/output/assets/css/images/ie6/borderTopCenter.png
-D  output/output/assets/css/images/ie6/borderTopLeft.png
-D  output/output/assets/css/images/ie6/borderTopRight.png
-D  output/output/assets/css/images/loading.gif
-D  output/output/assets/css/images/loading_background.png
-D  output/output/assets/css/images/overlay.png
-D  output/output/assets/css/rst.css
-D  output/output/assets/css/theme.css
-D  output/output/assets/fonts/
-D  output/output/assets/fonts/glyphicons-halflings-regular.eot
-D  output/output/assets/fonts/glyphicons-halflings-regular.svg
-D  output/output/assets/fonts/glyphicons-halflings-regular.ttf
-D  output/output/assets/fonts/glyphicons-halflings-regular.woff
-D  output/output/assets/img/
-D  output/output/assets/img/glyphicons-halflings-white.png
-D  output/output/assets/img/glyphicons-halflings.png
-D  output/output/assets/js/
-D  output/output/assets/js/all-nocdn.js
-D  output/output/assets/js/all.js
-D  output/output/assets/js/bootstrap.js
-D  output/output/assets/js/bootstrap.min.js
-D  output/output/assets/js/colorbox-i18n/
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-ar.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-bg.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-ca.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-cs.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-da.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-de.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-es.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-et.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-fa.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-fi.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-fr.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-gl.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-gr.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-he.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-hr.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-hu.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-id.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-it.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-ja.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-kr.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-lt.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-lv.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-my.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-nl.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-no.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-pl.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-pt-br.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-ro.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-ru.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-si.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-sk.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-sr.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-sv.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-tr.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-uk.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js
-D  output/output/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js
-D  output/output/assets/js/fancydates.js
-D  output/output/assets/js/flowr.plugin.js
-D  output/output/assets/js/html5.js
-D  output/output/assets/js/imagesloaded.pkgd.min.js
-D  output/output/assets/js/jquery.colorbox-min.js
-D  output/output/assets/js/jquery.colorbox.js
-D  output/output/assets/js/jquery.min.js
-D  output/output/assets/js/jquery.min.map
-D  output/output/assets/js/mathjax.js
-D  output/output/assets/js/moment-with-locales.min.js
-D  output/output/assets/xml/
-D  output/output/assets/xml/rss.xsl
-D  output/output/bazaar-tutorial.html
-D  output/output/blog/
-D  output/output/blog/index.html
-D  output/output/categories/
-D  output/output/categories/index.html
-D  output/output/community-140x140.png
-D  output/output/favicon.ico
-D  output/output/galleries/
-D  output/output/galleries/index.html
-D  output/output/galleries/rss.xml
-D  output/output/getting-involved.html
-D  output/output/index.html
-D  output/output/irc.html
-D  output/output/listings/
-D  output/output/listings/.directory.html
-D  output/output/listings/index.html
-D  output/output/logo-background.png
-D  output/output/logo.png
-D  output/output/logo_14x14.png
-D  output/output/logo_16x16.png
-D  output/output/logo_192x192.png
-D  output/output/logo_64x64.png
-D  output/output/robots.txt
-D  output/output/rss.xml
-D  output/output/sitemap.xml
-D  output/output/sitemapindex.xml
-D  output/output/ubuntu-logo-140x140.png
-D  output/output/za-flag-140x140.png
-D  output/rss.xml
-D  output/sitemap.xml
-D  output/ubuntu-logo-140x140.png
-D  output/za-flag-140x140.png
 M  pages/getting-involved.rst
Conflict: can't delete cache because it is not empty.  Not deleting.
Conflict because cache is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete cache/.mako.tmp because it is not empty.  Not deleting.
Conflict because cache/.mako.tmp is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cache/.mako.tmp/annotation_helper.tmpl.py
Contents conflict in cache/.mako.tmp/base.tmpl.py
Contents conflict in cache/.mako.tmp/base_helper.tmpl.py
Contents conflict in cache/.mako.tmp/comments_helper.tmpl.py
Contents conflict in cache/.mako.tmp/crumbs.tmpl.py
Contents conflict in cache/.mako.tmp/disqus_helper.tmpl.py
Contents conflict in cache/.mako.tmp/gallery.tmpl.py
Contents conflict in cache/.mako.tmp/googleplus_helper.tmpl.py
Contents conflict in cache/.mako.tmp/index.tmpl.py
Contents conflict in cache/.mako.tmp/index_helper.tmpl.py
Contents conflict in cache/.mako.tmp/intensedebate_helper.tmpl.py
Contents conflict in cache/.mako.tmp/list.tmpl.py
Contents conflict in cache/.mako.tmp/listing.tmpl.py
Contents conflict in cache/.mako.tmp/livefyre_helper.tmpl.py
Contents conflict in cache/.mako.tmp/moot_helper.tmpl.py
Contents conflict in cache/.mako.tmp/tags.tmpl.py
20 conflicts encountered.