[Monotone-commits-diffs] Revision 00c964b24ea24c370281b72129e3ccbf700fc1bb

[monotone]

-----------------------------------------------------------------
Revision: 00c964b24ea24c370281b72129e3ccbf700fc1bb
Ancestor: 152423c56494b6ffa315ae062cf64cbb39099f87
Ancestor: ac3b09b7e7b268480d92a98ce7c8456ed1524e25
Author: address@hidden
Date: 2006-02-27T15:55:35
Branch: net.venge.monotone.ssh

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:
        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 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 work.cc work.hh

ChangeLog: 

propagate from branch 'net.venge.monotone.cvssync.win32' (head 
ac3b09b7e7b268480d92a98ce7c8456ed1524e25)
            to branch 'net.venge.monotone.ssh' (head 
152423c56494b6ffa315ae062cf64cbb39099f87)


monotone --db={your.database} diff 
--revision=152423c56494b6ffa315ae062cf64cbb39099f87 
--revision=00c964b24ea24c370281b72129e3ccbf700fc1bb
monotone --db={your.database} diff 
--revision=ac3b09b7e7b268480d92a98ce7c8456ed1524e25 
--revision=00c964b24ea24c370281b72129e3ccbf700fc1bb
----------------------------------------------------------------------