[Monotone-commits-diffs] Revision f355b1c14e4d0946e501818030a45ae3f8eaf870

[monotone]

-----------------------------------------------------------------
Revision: f355b1c14e4d0946e501818030a45ae3f8eaf870
Ancestor: ac3b09b7e7b268480d92a98ce7c8456ed1524e25
Ancestor: e656f6e2bf3649eb4b7e5ebe4f52c171c8fc0b67
Author: address@hidden
Date: 2006-02-27T15:57:12
Branch: net.venge.monotone.cvssync

Renamed entries:
        tests/t_log_nofiles_merges.at to tests/t_log_nofiles_nomerges.at
        tests/t_sql_unpack.at to tests/t_sql_gunzip.at
Added files:
        CVS_prot botan/md5.cpp botan/md5.h cvs_client.cc
        cvs_client.hh cvs_sync.cc cvs_sync.hh piece_table.cc
        piece_table.hh stringtok.hh tests/t_cvspull_combined.at
        tests/t_cvspull_committemplate.at
        tests/t_cvspull_cvsbranch.at tests/t_cvspull_md5fail.at
        tests/t_cvspull_rapid.at tests/t_cvspull_samedirname.at
        tests/t_cvspull_separate.at tests/t_cvspull_xmodule.at
        tests/t_cvspush_loop.at tests/t_cvstakeover_modified.at
        tests/t_log_dir.at tests/t_log_selectors.at
        tests/t_merge_into_dir.at tests/t_pivot_root.at
        tests/t_pivot_root_revert.at tests/t_pivot_root_update.at
        tests/t_rosterify_root_suture.at tests/t_show_conflicts.at
Modified files:
        ChangeLog Makefile.am app_state.cc app_state.hh commands.cc
        contrib/ciabot_monotone.py contrib/color-logs.conf
        contrib/color-logs.sh contrib/monotone-notify.pl
        contrib/monotone.el cset.cc database.cc enumerator.hh
        file_io.cc file_io.hh merge.cc merge.hh monotone.cc
        monotone.texi netcmd.cc netcmd.hh netsync.cc options.hh
        paths.cc paths.hh po/sv.po rcs_import.cc revision.cc
        roster.cc roster.hh roster_merge.cc roster_merge.hh
        schema.sql schema_migration.cc std_hooks.lua
        tests/t_log_nofiles_nomerges.at tests/t_migrate_schema.at
        tests/t_sql_gunzip.at testsuite.at ui.cc ui.hh work.cc
        work.hh

ChangeLog: 

propagate from branch 'net.venge.monotone.cvssync.win32' (head 
ac3b09b7e7b268480d92a98ce7c8456ed1524e25)
            to branch 'net.venge.monotone.cvssync' (head 
e656f6e2bf3649eb4b7e5ebe4f52c171c8fc0b67)


monotone --db={your.database} diff 
--revision=ac3b09b7e7b268480d92a98ce7c8456ed1524e25 
--revision=f355b1c14e4d0946e501818030a45ae3f8eaf870
monotone --db={your.database} diff 
--revision=e656f6e2bf3649eb4b7e5ebe4f52c171c8fc0b67 
--revision=f355b1c14e4d0946e501818030a45ae3f8eaf870
----------------------------------------------------------------------