[Monotone-commits-nodiffs] Revision 627ea580a72fa20c88b893f1031c138567aed14c

[monotone]

-----------------------------------------------------------------
Revision: 627ea580a72fa20c88b893f1031c138567aed14c
Ancestor: 007652333e3cebae92ced7e31889f0c327b38959
Author: address@hidden
Date: 2005-05-20T08:17:40
Branch: net.venge.monotone

Added files:
        tests/t_drop_vs_dropadd.at
Modified files:
        ChangeLog change_set.cc testsuite.at

ChangeLog: 

        * change_set.cc (merge_disjoint_analyses): handle the case where
        a file is dropped on both sides but re-added on one.
        * tests/t_drop_vs_dropadd.at: a test for it
        * testsuite.at


monotone --db={your.database} diff 
--revision=007652333e3cebae92ced7e31889f0c327b38959 
--revision=627ea580a72fa20c88b893f1031c138567aed14c
----------------------------------------------------------------------