[Monotone-commits-diffs] Revision 4f94ee725575b15618133595287daaeda24f0236

[monotone]

-----------------------------------------------------------------
Revision: 4f94ee725575b15618133595287daaeda24f0236
Ancestor: 604f60f9594ffd726b35c42602dc94d4fbb69a2a
Ancestor: 87ee4825fa02d201b11663b826d33598026c0bb4
Author: address@hidden
Date: 2007-12-20T05:13:43
Branch: net.venge.monotone

Deleted entries:
        tests/show_conflicts tests/show_conflicts/__driver__.lua
Renamed entries:
        tests/automate_db_set,get to tests/automate_db_variables
Added files:
        tests/conflict_messages/__driver__.lua
Added directories:
        tests/conflict_messages
Modified files:
        NEWS UPGRADE automate.cc cmd_automate.cc cmd_diff_log.cc
        cmd_files.cc cmd_key_cert.cc cmd_list.cc cmd_merging.cc
        cmd_netsync.cc cmd_ws_commit.cc configure.ac
        debian/changelog debian/control
        debian/monotone-server.postrm diff_patch.cc diff_patch.hh
        lcs.cc lru_writeback_cache.hh lua.cc m4/pcre.m4 merge.cc
        monotone.spec monotone.texi netsync.cc netxx/address.cxx
        netxx/peer.cxx netxx_pipe.cc packet.cc paths.hh po/it.po
        roster.cc roster.hh roster_merge.cc roster_merge.hh
        sanity.hh tester.cc
        tests/automate_db_variables/__driver__.lua
        tests/command_completion/__driver__.lua unix/fs.cc
        unix/tester-plaf.cc visualc/config.h win32/monotone.iss
        work.cc xdelta.cc

ChangeLog: 

propagate from branch 'net.venge.monotone.cleanup.conflict-messages' (head 
87ee4825fa02d201b11663b826d33598026c0bb4)
            to branch 'net.venge.monotone' (head 
604f60f9594ffd726b35c42602dc94d4fbb69a2a)


monotone --db={your.database} diff 
--revision=604f60f9594ffd726b35c42602dc94d4fbb69a2a 
--revision=4f94ee725575b15618133595287daaeda24f0236
monotone --db={your.database} diff 
--revision=87ee4825fa02d201b11663b826d33598026c0bb4 
--revision=4f94ee725575b15618133595287daaeda24f0236
----------------------------------------------------------------------