[Monotone-commits-diffs] Revision b10cc44eaf1ce2dbe12b29d7f22c5f2bf2955418

[monotone]

-----------------------------------------------------------------
Revision: b10cc44eaf1ce2dbe12b29d7f22c5f2bf2955418
Ancestor: 018b112cc7460d80a4667e7e3d34507d4318b7f4
Ancestor: d1d73812d6878f17fc2e96f764c03f018e2e3f34
Author: Timothy Brownawell  <address@hidden>
Date: 2007-11-27T04:55:38
Branch: net.venge.monotone.netsync.refactor

Added files:
        network.cc network.hh tests/duplicate_key_id/__driver__.lua
        tests/duplicate_key_id/bad_test_key
        tests/merge((patch_a),_(drop_a))/__driver__.lua
Added directories:
        tests/duplicate_key_id tests/merge((patch_a),_(drop_a))
Modified files:
        Makefile.am NEWS automate.cc cert.cc cmd_list.cc
        cmd_merging.cc cmd_netsync.cc database.cc database.hh
        debian/changelog debian/copyright debian/rules lua_hooks.cc
        lua_hooks.hh netcmd.cc netcmd.hh netsync.cc po/de.po
        po/es.po refiner.cc refiner.hh roster_merge.cc

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
018b112cc7460d80a4667e7e3d34507d4318b7f4)
            to branch 'net.venge.monotone.netsync.refactor' (head 
d1d73812d6878f17fc2e96f764c03f018e2e3f34)


monotone --db={your.database} diff 
--revision=018b112cc7460d80a4667e7e3d34507d4318b7f4 
--revision=b10cc44eaf1ce2dbe12b29d7f22c5f2bf2955418
monotone --db={your.database} diff 
--revision=d1d73812d6878f17fc2e96f764c03f018e2e3f34 
--revision=b10cc44eaf1ce2dbe12b29d7f22c5f2bf2955418
----------------------------------------------------------------------