[Monotone-commits-nodiffs] Revision f21e8ccb9079bad5898964b5af9485a591d35b51

[monotone]

-----------------------------------------------------------------
Revision: f21e8ccb9079bad5898964b5af9485a591d35b51
Ancestor: 05d5b0511f4d0ab3bcfffe8277b0ae1cbeada5d0
Author: address@hidden
Date: 2008-01-14T04:23:33
Branch: net.venge.monotone.experiment.encapsulation

Modified files:
        cmd_merging.cc cmd_netsync.cc cmd_ws_commit.cc diff_patch.cc
        diff_patch.hh merge.cc merge.hh

ChangeLog: 

* diff_patch.cc: Include lua_hooks.hh; not app_state.hh.
(content_merge_database_adaptor, load_and_cache_roster)
(content_merge_workspace_adaptor, content_merge_checkout_adaptor):
Hold onto and pass around a database reference, not an app_state
reference.
(content_merger): Hold onto a lua_hooks reference, not an app_state
reference.  Move constructor into class declaration.
* diff_patch.hh: Update to match.
* merge.cc: Don't include app_state.hh.
(try_to_merge_files, resolve_merge_conflicts): Take lua_hooks,
not app_state.
(interactive_merge_and_store): Take lua_hooks and database,
not app_state.
* merge.hh: Update to match.
* cmd_merging.cc, cmd_netsync.cc, cmd_ws_comit.cc: Update uses of the above.


monotone --db={your.database} diff 
--revision=05d5b0511f4d0ab3bcfffe8277b0ae1cbeada5d0 
--revision=f21e8ccb9079bad5898964b5af9485a591d35b51
----------------------------------------------------------------------