[Monotone-commits-diffs] Revision ec246a4475b3538e20a159a001977dd22078c382

[monotone]

-----------------------------------------------------------------
Revision: ec246a4475b3538e20a159a001977dd22078c382
Ancestor: 464d367d2158a59d6e988391b598d88365ebb7d5
Ancestor: c54707315ed249dac9897aad637477e82300cbce
Author: Timothy Brownawell  <address@hidden>
Date: 2006-11-18T20:55:18
Branch: net.venge.monotone.contrib.webhost

Deleted entries:
        usher/README www/viewmtn/about.psp www/viewmtn/branch.psp
        www/viewmtn/diff.psp www/viewmtn/enscriptlangs.py
        www/viewmtn/error.psp www/viewmtn/file.psp
        www/viewmtn/fileinbranch.psp www/viewmtn/headofbranch.psp
        www/viewmtn/help.psp www/viewmtn/html.py
        www/viewmtn/index.psp www/viewmtn/manifest.psp
        www/viewmtn/mimetypes/gnome-fs-directory.png
        www/viewmtn/mimetypes/gnome-library.png
        www/viewmtn/mimetypes/gnome-mime-application-magicpoint.png
        www/viewmtn/mimetypes/gnome-mime-application-msword.png
        www/viewmtn/mimetypes/gnome-mime-application-ogg.png
        www/viewmtn/mimetypes/gnome-mime-application-par.png
        www/viewmtn/mimetypes/gnome-mime-application-pdf.png
        www/viewmtn/mimetypes/gnome-mime-application-pgp-encrypted.png
        www/viewmtn/mimetypes/gnome-mime-application-pgp-keys.png
        www/viewmtn/mimetypes/gnome-mime-application-pgp.png
        www/viewmtn/mimetypes/gnome-mime-application-postscript.png
        www/viewmtn/mimetypes/gnome-mime-application-qif.png
        www/viewmtn/mimetypes/gnome-mime-application-rhythmbox-effect.png
        www/viewmtn/mimetypes/gnome-mime-application-rhythmbox-playlist.png
        www/viewmtn/mimetypes/gnome-mime-application-rtf.png
        www/viewmtn/mimetypes/gnome-mime-application-smil.png
        www/viewmtn/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png
        www/viewmtn/mimetypes/gnome-mime-application-vnd.ms-excel.png
        www/viewmtn/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png
        www/viewmtn/mimetypes/gnome-mime-application-vnd.ms-word.png
        www/viewmtn/mimetypes/gnome-mime-application-vnd.stardivision.calc.png
        
www/viewmtn/mimetypes/gnome-mime-application-vnd.stardivision.impress.png
        www/viewmtn/mimetypes/gnome-mime-application-vnd.stardivision.writer.png
        www/viewmtn/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png
        www/viewmtn/mimetypes/gnome-mime-application-vnd.sun.xml.draw.png
        www/viewmtn/mimetypes/gnome-mime-application-vnd.sun.xml.impress.png
        www/viewmtn/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png
        
www/viewmtn/mimetypes/gnome-mime-application-vnd.sun.xml.writer.template.png
        www/viewmtn/mimetypes/gnome-mime-application-wordperfect.png
        www/viewmtn/mimetypes/gnome-mime-application-x-abiword.png
        www/viewmtn/mimetypes/gnome-mime-application-x-applix-spreadsheet.png
        www/viewmtn/mimetypes/gnome-mime-application-x-applix-word.png
        www/viewmtn/mimetypes/gnome-mime-application-x-archive.png
        www/viewmtn/mimetypes/gnome-mime-application-x-arj.png
        www/viewmtn/mimetypes/gnome-mime-application-x-bittorrent.png
        www/viewmtn/mimetypes/gnome-mime-application-x-bla.png
        www/viewmtn/mimetypes/gnome-mime-application-x-blender.png
        www/viewmtn/mimetypes/gnome-mime-application-x-blf.png
        www/viewmtn/mimetypes/gnome-mime-application-x-blv.png
        www/viewmtn/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png
        www/viewmtn/mimetypes/gnome-mime-application-x-bzip.png
        www/viewmtn/mimetypes/gnome-mime-application-x-cd-image.png
        www/viewmtn/mimetypes/gnome-mime-application-x-class-file.png
        www/viewmtn/mimetypes/gnome-mime-application-x-compress.png
        www/viewmtn/mimetypes/gnome-mime-application-x-compressed-tar.png
        www/viewmtn/mimetypes/gnome-mime-application-x-core.png
        www/viewmtn/mimetypes/gnome-mime-application-x-cpio-compressed.png
        www/viewmtn/mimetypes/gnome-mime-application-x-cpio.png
        www/viewmtn/mimetypes/gnome-mime-application-x-dc-rom.png
        www/viewmtn/mimetypes/gnome-mime-application-x-deb.png
        www/viewmtn/mimetypes/gnome-mime-application-x-desktop.png
        www/viewmtn/mimetypes/gnome-mime-application-x-dia-diagram.png
        www/viewmtn/mimetypes/gnome-mime-application-x-dv.png
        www/viewmtn/mimetypes/gnome-mime-application-x-dvi.png
        www/viewmtn/mimetypes/gnome-mime-application-x-e-theme.png
        www/viewmtn/mimetypes/gnome-mime-application-x-executable.png
        www/viewmtn/mimetypes/gnome-mime-application-x-extension-nfo.png
        www/viewmtn/mimetypes/gnome-mime-application-x-extension-par2.png
        www/viewmtn/mimetypes/gnome-mime-application-x-font-afm.png
        www/viewmtn/mimetypes/gnome-mime-application-x-font-bdf.png
        www/viewmtn/mimetypes/gnome-mime-application-x-font-linux-psf.png
        www/viewmtn/mimetypes/gnome-mime-application-x-font-pcf.png
        www/viewmtn/mimetypes/gnome-mime-application-x-font-sunos-news.png
        www/viewmtn/mimetypes/gnome-mime-application-x-font-ttf.png
        www/viewmtn/mimetypes/gnome-mime-application-x-gameboy-rom.png
        www/viewmtn/mimetypes/gnome-mime-application-x-genesis-rom.png
        www/viewmtn/mimetypes/gnome-mime-application-x-glade.png
        www/viewmtn/mimetypes/gnome-mime-application-x-gnucash.png
        www/viewmtn/mimetypes/gnome-mime-application-x-gnumeric.png
        www/viewmtn/mimetypes/gnome-mime-application-x-gtktalog.png
        www/viewmtn/mimetypes/gnome-mime-application-x-gzip.png
        www/viewmtn/mimetypes/gnome-mime-application-x-ipod-firmware.png
        www/viewmtn/mimetypes/gnome-mime-application-x-jar.png
        www/viewmtn/mimetypes/gnome-mime-application-x-killustrator.png
        www/viewmtn/mimetypes/gnome-mime-application-x-kpresenter.png
        www/viewmtn/mimetypes/gnome-mime-application-x-kspread.png
        www/viewmtn/mimetypes/gnome-mime-application-x-kword.png
        www/viewmtn/mimetypes/gnome-mime-application-x-lha.png
        www/viewmtn/mimetypes/gnome-mime-application-x-lhz.png
        www/viewmtn/mimetypes/gnome-mime-application-x-mrproject.png
        www/viewmtn/mimetypes/gnome-mime-application-x-msx-rom.png
        www/viewmtn/mimetypes/gnome-mime-application-x-n64-rom.png
        www/viewmtn/mimetypes/gnome-mime-application-x-nes-rom.png
        www/viewmtn/mimetypes/gnome-mime-application-x-object.png
        www/viewmtn/mimetypes/gnome-mime-application-x-perl.png
        www/viewmtn/mimetypes/gnome-mime-application-x-php.png
        www/viewmtn/mimetypes/gnome-mime-application-x-python-bytecode.png
        www/viewmtn/mimetypes/gnome-mime-application-x-python.png
        www/viewmtn/mimetypes/gnome-mime-application-x-qw.png
        www/viewmtn/mimetypes/gnome-mime-application-x-rar.png
        www/viewmtn/mimetypes/gnome-mime-application-x-reject.png
        www/viewmtn/mimetypes/gnome-mime-application-x-rpm.png
        www/viewmtn/mimetypes/gnome-mime-application-x-ruby.png
        www/viewmtn/mimetypes/gnome-mime-application-x-sharedlib.png
        www/viewmtn/mimetypes/gnome-mime-application-x-shellscript.png
        www/viewmtn/mimetypes/gnome-mime-application-x-shockwave-flash.png
        www/viewmtn/mimetypes/gnome-mime-application-x-sms-rom.png
        www/viewmtn/mimetypes/gnome-mime-application-x-sql.png
        www/viewmtn/mimetypes/gnome-mime-application-x-stuffit.png
        www/viewmtn/mimetypes/gnome-mime-application-x-tar.png
        www/viewmtn/mimetypes/gnome-mime-application-x-tex.png
        www/viewmtn/mimetypes/gnome-mime-application-x-trash.png
        www/viewmtn/mimetypes/gnome-mime-application-x-x509-ca-cert.png
        www/viewmtn/mimetypes/gnome-mime-application-zip.png
        www/viewmtn/mimetypes/gnome-mime-application.png
        www/viewmtn/mimetypes/gnome-mime-audio-ac3.png
        www/viewmtn/mimetypes/gnome-mime-audio-basic.png
        www/viewmtn/mimetypes/gnome-mime-audio-midi.png
        www/viewmtn/mimetypes/gnome-mime-audio-x-aiff.png
        www/viewmtn/mimetypes/gnome-mime-audio-x-it.png
        www/viewmtn/mimetypes/gnome-mime-audio-x-midi.png
        www/viewmtn/mimetypes/gnome-mime-audio-x-mod.png
        www/viewmtn/mimetypes/gnome-mime-audio-x-mp3.png
        www/viewmtn/mimetypes/gnome-mime-audio-x-s3m.png
        www/viewmtn/mimetypes/gnome-mime-audio-x-stm.png
        www/viewmtn/mimetypes/gnome-mime-audio-x-ulaw.png
        www/viewmtn/mimetypes/gnome-mime-audio-x-voc.png
        www/viewmtn/mimetypes/gnome-mime-audio-x-wav.png
        www/viewmtn/mimetypes/gnome-mime-audio-x-xi.png
        www/viewmtn/mimetypes/gnome-mime-audio-x-xm.png
        www/viewmtn/mimetypes/gnome-mime-audio.png
        www/viewmtn/mimetypes/gnome-mime-image-bmp.png
        www/viewmtn/mimetypes/gnome-mime-image-gif.png
        www/viewmtn/mimetypes/gnome-mime-image-jpeg.png
        www/viewmtn/mimetypes/gnome-mime-image-png.png
        www/viewmtn/mimetypes/gnome-mime-image-svg+xml.png
        www/viewmtn/mimetypes/gnome-mime-image-svg.png
        www/viewmtn/mimetypes/gnome-mime-image-tiff.png
        www/viewmtn/mimetypes/gnome-mime-image-wmf.png
        www/viewmtn/mimetypes/gnome-mime-image-x-3ds.png
        www/viewmtn/mimetypes/gnome-mime-image-x-applix-graphic.png
        www/viewmtn/mimetypes/gnome-mime-image-x-cmu-raster.png
        www/viewmtn/mimetypes/gnome-mime-image-x-lwo.png
        www/viewmtn/mimetypes/gnome-mime-image-x-lws.png
        www/viewmtn/mimetypes/gnome-mime-image-x-xcf.png
        www/viewmtn/mimetypes/gnome-mime-image.png
        www/viewmtn/mimetypes/gnome-mime-text-css.png
        www/viewmtn/mimetypes/gnome-mime-text-html.png
        www/viewmtn/mimetypes/gnome-mime-text-x-authors.png
        www/viewmtn/mimetypes/gnome-mime-text-x-c++src.png
        www/viewmtn/mimetypes/gnome-mime-text-x-c-header.png
        www/viewmtn/mimetypes/gnome-mime-text-x-c.png
        www/viewmtn/mimetypes/gnome-mime-text-x-chdr.png
        www/viewmtn/mimetypes/gnome-mime-text-x-copying.png
        www/viewmtn/mimetypes/gnome-mime-text-x-credits.png
        www/viewmtn/mimetypes/gnome-mime-text-x-csh.png
        www/viewmtn/mimetypes/gnome-mime-text-x-csharp.png
        www/viewmtn/mimetypes/gnome-mime-text-x-csrc.png
        www/viewmtn/mimetypes/gnome-mime-text-x-haskell.png
        www/viewmtn/mimetypes/gnome-mime-text-x-install.png
        www/viewmtn/mimetypes/gnome-mime-text-x-java.png
        www/viewmtn/mimetypes/gnome-mime-text-x-literate-haskell.png
        www/viewmtn/mimetypes/gnome-mime-text-x-lyx.png
        www/viewmtn/mimetypes/gnome-mime-text-x-makefile.png
        www/viewmtn/mimetypes/gnome-mime-text-x-objcsrc.png
        www/viewmtn/mimetypes/gnome-mime-text-x-patch.png
        www/viewmtn/mimetypes/gnome-mime-text-x-readme.png
        www/viewmtn/mimetypes/gnome-mime-text-x-scheme.png
        www/viewmtn/mimetypes/gnome-mime-text-x-sql.png
        www/viewmtn/mimetypes/gnome-mime-text-x-tex.png
        www/viewmtn/mimetypes/gnome-mime-text-x-troff-man.png
        www/viewmtn/mimetypes/gnome-mime-text-x-txt.png
        www/viewmtn/mimetypes/gnome-mime-text-x-vcalendar.png
        www/viewmtn/mimetypes/gnome-mime-text-x-vcard.png
        www/viewmtn/mimetypes/gnome-mime-text-x-zsh.png
        www/viewmtn/mimetypes/gnome-mime-text-xml.png
        www/viewmtn/mimetypes/gnome-mime-text.png
        www/viewmtn/mimetypes/gnome-mime-video-mpeg.png
        www/viewmtn/mimetypes/gnome-mime-video-quicktime.png
        www/viewmtn/mimetypes/gnome-mime-video-x-ms-asf.png
        www/viewmtn/mimetypes/gnome-mime-video-x-ms-wmv.png
        www/viewmtn/mimetypes/gnome-mime-video-x-msvideo.png
        www/viewmtn/mimetypes/gnome-mime-video.png
        www/viewmtn/mimetypes/gnome-mime-x-directory-nfs-server.png
        www/viewmtn/mimetypes/gnome-mime-x-directory-smb-server.png
        www/viewmtn/mimetypes/gnome-mime-x-directory-smb-share.png
        www/viewmtn/mimetypes/gnome-mime-x-directory-smb-workgroup.png
        www/viewmtn/mimetypes/gnome-mime-x-font-afm.png
        www/viewmtn/mimetypes/gnome-package.png
        www/viewmtn/mimetypes/openofficeorg-19-database.png
        www/viewmtn/mimetypes/openofficeorg-19-drawing-template.png
        www/viewmtn/mimetypes/openofficeorg-19-drawing.png
        www/viewmtn/mimetypes/openofficeorg-19-formula.png
        www/viewmtn/mimetypes/openofficeorg-19-master-document.png
        www/viewmtn/mimetypes/openofficeorg-19-oasis-database.png
        www/viewmtn/mimetypes/openofficeorg-19-oasis-drawing-template.png
        www/viewmtn/mimetypes/openofficeorg-19-oasis-drawing.png
        www/viewmtn/mimetypes/openofficeorg-19-oasis-formula.png
        www/viewmtn/mimetypes/openofficeorg-19-oasis-master-document.png
        www/viewmtn/mimetypes/openofficeorg-19-oasis-presentation-template.png
        www/viewmtn/mimetypes/openofficeorg-19-oasis-presentation.png
        www/viewmtn/mimetypes/openofficeorg-19-oasis-spreadsheet-template.png
        www/viewmtn/mimetypes/openofficeorg-19-oasis-spreadsheet.png
        www/viewmtn/mimetypes/openofficeorg-19-oasis-text-template.png
        www/viewmtn/mimetypes/openofficeorg-19-oasis-text.png
        www/viewmtn/mimetypes/openofficeorg-19-oasis-web-template.png
        www/viewmtn/mimetypes/openofficeorg-19-presentation-template.png
        www/viewmtn/mimetypes/openofficeorg-19-presentation.png
        www/viewmtn/mimetypes/openofficeorg-19-spreadsheet-template.png
        www/viewmtn/mimetypes/openofficeorg-19-spreadsheet.png
        www/viewmtn/mimetypes/openofficeorg-19-text-template.png
        www/viewmtn/mimetypes/openofficeorg-19-text.png
        www/viewmtn/monotone.py www/viewmtn/revision.psp
        www/viewmtn/tags.psp www/viewmtn/tarofbranch.psp
        www/viewmtn/wrapper.py
Renamed entries:
        usher/usher.txt to usher/README
        www/viewmtn/MochiKit to www/viewmtn/static/MochiKit
        www/viewmtn/builtpython.sh to www/viewmtn/release.sh
        www/viewmtn/rss_feed.gif to www/viewmtn/static/rss_feed.gif
        www/viewmtn/version.py to www/viewmtn/release.py
        www/viewmtn/viewmtn.css to www/viewmtn/static/viewmtn.css
        www/viewmtn/viewmtn.js to www/viewmtn/static/viewmtn.js
Added files:
        www/user-actions.php www/viewmtn/INSTALL
        www/viewmtn/fdo/__init__.py www/viewmtn/fdo/icontheme.py
        www/viewmtn/fdo/sharedmimeinfo.py
        www/viewmtn/fdo/xdgbasedir.py www/viewmtn/genproxy.py
        www/viewmtn/static/highlight.css www/viewmtn/syntax.py
        www/viewmtn/templates/branch.html
        www/viewmtn/templates/branchchanges.html
        www/viewmtn/templates/branchchangesrss.html
        www/viewmtn/templates/branchchoosehead.html
        www/viewmtn/templates/revisionbrowse.html
        www/viewmtn/templates/revisiondiff.html
        www/viewmtn/templates/revisionfile.html
        www/viewmtn/templates/revisionfilebin.html
        www/viewmtn/templates/revisionfileimg.html
        www/viewmtn/templates/revisionfileobj.html
        www/viewmtn/templates/revisionfiletxt.html
Added directories:
        www/viewmtn/fdo www/viewmtn/static
Modified files:
        install install-config.dist schema.sql usher/README
        usher/server.cc usher/server_manager.cc webhost.initscript
        www/admin-description_backend.php www/common.php
        www/login.php www/sidebar.php www/user.php
        www/viewmtn/ChangeLog www/viewmtn/TODO www/viewmtn/common.py
        www/viewmtn/config.py.example www/viewmtn/mtn.py
        www/viewmtn/release.py www/viewmtn/release.sh
        www/viewmtn/static/viewmtn.css
        www/viewmtn/templates/about.html
        www/viewmtn/templates/base.html
        www/viewmtn/templates/help.html
        www/viewmtn/templates/index.html
        www/viewmtn/templates/revisioninfo.html
        www/viewmtn/templates/tags.html www/viewmtn/viewmtn.py
Modified attrs:
        www/viewmtn/fdo/icontheme.py
        www/viewmtn/fdo/sharedmimeinfo.py www/viewmtn/genproxy.py
        www/viewmtn/syntax.py

ChangeLog: 

merge of '464d367d2158a59d6e988391b598d88365ebb7d5'
     and 'c54707315ed249dac9897aad637477e82300cbce'


monotone --db={your.database} diff 
--revision=464d367d2158a59d6e988391b598d88365ebb7d5 
--revision=ec246a4475b3538e20a159a001977dd22078c382
monotone --db={your.database} diff 
--revision=c54707315ed249dac9897aad637477e82300cbce 
--revision=ec246a4475b3538e20a159a001977dd22078c382
----------------------------------------------------------------------