[Monotone-commits-diffs] Revision 39b3908945c292fc451282db080c545a5c177893

[monotone]

-----------------------------------------------------------------
Revision: 39b3908945c292fc451282db080c545a5c177893
Ancestor: 3877d4a0744726103a87a698cc021671edcef0fc
Ancestor: bdf1919dde5d3b2d43db997cceae26c94838d7bc
Author: address@hidden
Date: 2008-02-05T20:41:06
Branch: net.venge.monotone.gaps

Added files:
        tests/automate_put_sentinel/__driver__.lua
        tests/imp_test_filesync_confdir/__driver__.lua
        tests/merge_update_part_of_file/__driver__.lua
        tests/merge_update_part_of_file/after.diff
        tests/merge_update_part_of_file/before.diff
        tests/merge_update_part_of_file/onechange
        tests/merge_update_part_of_file/original
        tests/merge_update_part_of_file/twochanges
        tests/update_with_pending_modification/__driver__.lua
Added directories:
        tests/automate_put_sentinel tests/imp_test_filesync_confdir
        tests/merge_update_part_of_file
        tests/update_with_pending_modification
Modified files:
        automate.cc cmd_diff_log.cc cmd_merging.cc cmd_ws_commit.cc
        commands.cc database.cc database.hh database_check.cc
        enumerator.cc merge.cc merge.hh monotone.cc netsync.cc
        revision.cc revision.hh schema.sql schema_migration.cc
        tests/schema_migration/__driver__.lua tests/test_hooks.lua
        vocab.hh vocab_terms.hh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
bdf1919dde5d3b2d43db997cceae26c94838d7bc)
            to branch 'net.venge.monotone.gaps' (head 
3877d4a0744726103a87a698cc021671edcef0fc)


monotone --db={your.database} diff 
--revision=3877d4a0744726103a87a698cc021671edcef0fc 
--revision=39b3908945c292fc451282db080c545a5c177893
monotone --db={your.database} diff 
--revision=bdf1919dde5d3b2d43db997cceae26c94838d7bc 
--revision=39b3908945c292fc451282db080c545a5c177893
----------------------------------------------------------------------