[Monotone-commits-diffs] Revision ac3b09b7e7b268480d92a98ce7c8456ed1524e25

[monotone]

-----------------------------------------------------------------
Revision: ac3b09b7e7b268480d92a98ce7c8456ed1524e25
Ancestor: 23033446534a8827890d9fc0abdfa5d1262f875c
Ancestor: 72d0e20b2431da01c2c7502e04b87bc9489a2ef8
Author: address@hidden
Date: 2006-02-27T15:55:25
Branch: net.venge.monotone.cvssync.win32

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:
        netxx_pipe.cc netxx_pipe.hh 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 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 netxx/probe.h
        options.hh paths.cc paths.hh platform.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 unit_tests.cc
        unit_tests.hh win32/process.cc work.cc work.hh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
72d0e20b2431da01c2c7502e04b87bc9489a2ef8)
            to branch 'net.venge.monotone.cvssync.win32' (head 
23033446534a8827890d9fc0abdfa5d1262f875c)


monotone --db={your.database} diff 
--revision=23033446534a8827890d9fc0abdfa5d1262f875c 
--revision=ac3b09b7e7b268480d92a98ce7c8456ed1524e25
monotone --db={your.database} diff 
--revision=72d0e20b2431da01c2c7502e04b87bc9489a2ef8 
--revision=ac3b09b7e7b268480d92a98ce7c8456ed1524e25
----------------------------------------------------------------------