[Monotone-commits-nodiffs] Revision dba304830ac5f9ee77fdde1c8d5b4ea71e542987

[monotone]

-----------------------------------------------------------------
Revision: dba304830ac5f9ee77fdde1c8d5b4ea71e542987
Ancestor: c57580e307d36d425061ad1044fccc11f73f6e05
Author: Matt Johnston <address@hidden>
Date: 2007-05-12T08:19:08
Branch: net.venge.monotone

Modified files:
        diff_patch.cc diff_patch.hh work.cc

ChangeLog: 

        * diff_patch.cc (content_merge_database_adaptor::record_merge):
        create right_delta by diffing against the right data (not the left).
        Previously the resultant delta was didn't actually get used.
        * diff_patch.hh, work.cc: add right_data argument to record_merge.


monotone --db={your.database} diff 
--revision=c57580e307d36d425061ad1044fccc11f73f6e05 
--revision=dba304830ac5f9ee77fdde1c8d5b4ea71e542987
----------------------------------------------------------------------