[Monotone-commits-nodiffs] Revision 0d0071f9d9f9d85c76ad03c4639c37ec1296774c

[monotone]

-----------------------------------------------------------------
Revision: 0d0071f9d9f9d85c76ad03c4639c37ec1296774c
Ancestor: 43490815a92741c5b65aff998f77fe546cdc5f1f
Author: address@hidden
Date: 2006-07-09T07:19:51
Branch: net.venge.monotone

Modified files:
        ChangeLog cmd_merging.cc roster.hh
        tests/pluck_lifecycle/__driver__.lua

ChangeLog: 

2006-07-09  Nathaniel Smith  <address@hidden>

        * cmd_merging.cc (pluck): Restructure to handle nids correctly.
        * tests/pluck_lifecycle/__driver__.lua: Fix and un-xfail.
        * roster.hh (make_roster_for_base_plus_cset): Fix typo.


monotone --db={your.database} diff 
--revision=43490815a92741c5b65aff998f77fe546cdc5f1f 
--revision=0d0071f9d9f9d85c76ad03c4639c37ec1296774c
----------------------------------------------------------------------