[Monotone-commits-diffs] Revision 73fcc0b441a09645165df99004d2aa1d5bfbfa4b

[monotone]

-----------------------------------------------------------------
Revision: 73fcc0b441a09645165df99004d2aa1d5bfbfa4b
Ancestor: a973fb7eef75c2fd777d57943aa354a56ce60dc3
Ancestor: fb5d7770cc09575641ace2932dbdedc5e9ec02dd
Author: address@hidden
Date: 2008-01-05T14:11:51
Branch: net.venge.monotone.experiment.informal_messages_to_stdio

Deleted entries:
        tests/show_conflicts tests/show_conflicts/__driver__.lua
Renamed entries:
        visualc/unit_tests.vcproj to visualc/unit_tester.vcproj
Added files:
        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 m4/pcre.m4
        merge.cc monotone.texi netxx_pipe.cc paths.hh po/POTFILES.in
        po/de.po po/es.po po/it.po po/sv.po roster.cc roster.hh
        roster_merge.cc roster_merge.hh sanity.hh ssh_agent.cc
        tester.cc tests/command_completion/__driver__.lua
        tests/server_initiated_sync/__driver__.lua ui.cc ui.hh
        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.experiment.informal_messages_to_stdio' (head 
a973fb7eef75c2fd777d57943aa354a56ce60dc3)


monotone --db={your.database} diff 
--revision=a973fb7eef75c2fd777d57943aa354a56ce60dc3 
--revision=73fcc0b441a09645165df99004d2aa1d5bfbfa4b
monotone --db={your.database} diff 
--revision=fb5d7770cc09575641ace2932dbdedc5e9ec02dd 
--revision=73fcc0b441a09645165df99004d2aa1d5bfbfa4b
----------------------------------------------------------------------