[Monotone-commits-diffs] Revision 589bdbfad8141761c029bf0a08ad559e9ff44764

[monotone]

-----------------------------------------------------------------
Revision: 589bdbfad8141761c029bf0a08ad559e9ff44764
Ancestor: b05b43e361cc6a00555c34ffe8687f1dc1b62211
Ancestor: fb5d7770cc09575641ace2932dbdedc5e9ec02dd
Author: Timothy Brownawell  <address@hidden>
Date: 2008-01-06T19:15:56
Branch: net.venge.monotone.netsync.refactor

Deleted entries:
        tests/show_conflicts tests/show_conflicts/__driver__.lua
Renamed entries:
        tests/automate_db_set,get to tests/automate_db_variables
        visualc/unit_tests.vcproj to visualc/unit_tester.vcproj
Added files:
        netsync.hh network.cc network.hh
        tests/calculation_of_unidiffs_start_of_file/__driver__.lua
        tests/calculation_of_unidiffs_start_of_file/firstfile
        tests/calculation_of_unidiffs_start_of_file/secondfile
        tests/conflict_messages/__driver__.lua
Added directories:
        tests/calculation_of_unidiffs_start_of_file
        tests/conflict_messages
Modified files:
        Makefile.am NEWS automate.cc cmd_automate.cc cmd_diff_log.cc
        cmd_merging.cc cmd_netsync.cc cmd_ws_commit.cc configure.ac
        diff_patch.cc diff_patch.hh key_store.cc lua.cc lua_hooks.cc
        lua_hooks.hh m4/pcre.m4 merge.cc monotone.spec monotone.texi
        netcmd.cc netcmd.hh netsync.cc netxx_pipe.cc paths.hh
        po/POTFILES.in po/de.po po/es.po po/it.po po/sv.po
        refiner.cc refiner.hh roster.cc roster.hh roster_merge.cc
        roster_merge.hh sanity.hh ssh_agent.cc tester.cc
        tests/automate_db_variables/__driver__.lua
        tests/command_completion/__driver__.lua
        tests/server_initiated_sync/__driver__.lua
        visualc/monotone.sln visualc/runtests.bat
        visualc/unit_tester.vcproj win32/main.cc work.cc

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
fb5d7770cc09575641ace2932dbdedc5e9ec02dd)
            to branch 'net.venge.monotone.netsync.refactor' (head 
b05b43e361cc6a00555c34ffe8687f1dc1b62211)


monotone --db={your.database} diff 
--revision=b05b43e361cc6a00555c34ffe8687f1dc1b62211 
--revision=589bdbfad8141761c029bf0a08ad559e9ff44764
monotone --db={your.database} diff 
--revision=fb5d7770cc09575641ace2932dbdedc5e9ec02dd 
--revision=589bdbfad8141761c029bf0a08ad559e9ff44764
----------------------------------------------------------------------