[Monotone-commits-diffs] Revision 3ae76a35dc14734cb0fbb9348b65d3b8a10af38b

[monotone]

-----------------------------------------------------------------
Revision: 3ae76a35dc14734cb0fbb9348b65d3b8a10af38b
Ancestor: 3b45396a09c1448f180f5354f9f7b7030d570411
Ancestor: 6fef321d5b72ca491b80dd0d03d7549a8f401e4e
Author: Timothy Brownawell  <address@hidden>
Date: 2007-11-25T16:09:03
Branch: net.venge.monotone

Added files:
        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:
        NEWS cert.cc cmd_list.cc cmd_merging.cc roster_merge.cc

ChangeLog: 

merge of '3b45396a09c1448f180f5354f9f7b7030d570411'
     and '6fef321d5b72ca491b80dd0d03d7549a8f401e4e'


monotone --db={your.database} diff 
--revision=3b45396a09c1448f180f5354f9f7b7030d570411 
--revision=3ae76a35dc14734cb0fbb9348b65d3b8a10af38b
monotone --db={your.database} diff 
--revision=6fef321d5b72ca491b80dd0d03d7549a8f401e4e 
--revision=3ae76a35dc14734cb0fbb9348b65d3b8a10af38b
----------------------------------------------------------------------