[Monotone-commits-nodiffs] Revision 490e2bd9ae9a28684f56a09e92ade06f495ad3e2

[monotone]

-----------------------------------------------------------------
Revision: 490e2bd9ae9a28684f56a09e92ade06f495ad3e2
Ancestor: 34608830e786b6ee7f691f2c3de0280727324a85
Author: address@hidden
Date: 2008-09-06T21:14:00
Branch: net.venge.monotone.resolve_conflicts

Added files:
        tests/resolve_conflict_all_resolutions/conflicts-resolved
        tests/resolve_conflict_all_resolutions/merge-1
        tests/resolve_conflict_all_resolutions/show_first-checkout_left
        tests/resolve_conflict_all_resolutions/show_first-checkout_right
        tests/resolve_conflict_all_resolutions/show_first-thermostat
        tests/resolve_conflict_all_resolutions/show_first-user
        tests/resolve_duplicate_name_conflict/merge-1
Modified files:
        cmd_automate.cc diff_patch.cc diff_patch.hh monotone.texi
        paths.cc roster.cc roster.hh roster_merge.cc
        tests/resolve_conflict_all_resolutions/__driver__.lua
        tests/resolve_conflict_all_resolutions/conflicts-1
        tests/resolve_duplicate_name_conflict/__driver__.lua work.cc

ChangeLog: 

Finish first round of implementing conflict resolutions. Functional, but need 
more error checking.

* cmd_automate.cc (interface_version): bump for show_conflicts outputing
  'resolved_internal'.

* diff_patch.hh (content_merge_adaptor): add record_file

* diff_patch.cc (content_merge_database_adaptor::record_file): new.
  (content_merge_workspace_adaptor::record_file): new.
  (content_merge_checkout_adaptor::record_file): new.

* monotone.texi: Add 'conflicts' commands, conflict resolutions.

* paths.cc (bookkeeping_path::external_string_is_bookkeeping_path):
  Return false (don't throw exception) when path is absolute.
  (UNIT_TEST): Test it.

* roster.cc (roster_t::drop_detached_node): Allow dropping a node that
  was never attached, for 'drop' conflict resolution.

* roster.hh (class roster_t): Resolve FIXME: Allow dropping a node that
  was never attached.

* roster_merge.cc (resolve_duplicate_name_one_side): new.
  (roster_merge_result::resolve_duplicate_name_conflicts): Finish implementing.

* tests/resolve_conflict_all_resolutions/__driver__.lua: Finish.
* tests/resolve_conflict_all_resolutions/conflicts-1: Match test changes.
* tests/resolve_conflict_all_resolutions/conflicts-resolved: New file.
* tests/resolve_conflict_all_resolutions/merge-1: New file.
* tests/resolve_conflict_all_resolutions/show_first-checkout_left: New file.
* tests/resolve_conflict_all_resolutions/show_first-checkout_right: New file.
* tests/resolve_conflict_all_resolutions/show_first-thermostat: New file.
* tests/resolve_conflict_all_resolutions/show_first-user: New file.

* tests/resolve_duplicate_name_conflict/__driver__.lua: finish
* tests/resolve_duplicate_name_conflict/merge-1: New file.

* work.cc (struct content_merge_empty_adaptor): Add record_file.


monotone --db={your.database} diff 
--revision=34608830e786b6ee7f691f2c3de0280727324a85 
--revision=490e2bd9ae9a28684f56a09e92ade06f495ad3e2
----------------------------------------------------------------------