[Monotone-commits-diffs] Revision e049796e9dfbbf59177aa5f1c26a68bd23837cc2

[monotone]

-----------------------------------------------------------------
Revision: e049796e9dfbbf59177aa5f1c26a68bd23837cc2
Ancestor: 088382fa59d82361dff7759656e003b4a38a0a13
Ancestor: d71c0ed3d94eed7804a99d5c76a3a732a35b4233
Author: address@hidden
Date: 2008-09-10T05:18:40
Branch: net.venge.monotone.resolve_conflicts

Renamed entries:
        tests/resolve_conflict_all_resolutions to 
tests/resolve_conflicts_all_resolutions
Added files:
        tests/ls_duplicates_with_duplicates/__driver__.lua
        tests/ls_duplicates_with_workspace/__driver__.lua
        tests/ls_duplicates_without_duplicates/__driver__.lua
        tests/resolve_conflicts_all_resolutions/show_remaining-checkout_left
        tests/resolve_conflicts_all_resolutions/show_remaining-thermostat
        tests/resolve_conflicts_read_all/__driver__.lua
        tests/resolve_conflicts_read_all/attribute-attached_left
        tests/resolve_conflicts_read_all/attribute-attached_right
        tests/resolve_conflicts_read_all/attribute-detached_left
        tests/resolve_conflicts_read_all/attribute-detached_right
        tests/resolve_conflicts_read_all/content-attached_left
        tests/resolve_conflicts_read_all/content-attached_right
        tests/resolve_conflicts_read_all/content-detached_left
        tests/resolve_conflicts_read_all/content-detached_right
        tests/resolve_conflicts_read_all/directory-loop_left
        tests/resolve_conflicts_read_all/directory-loop_right
        tests/resolve_conflicts_read_all/duplicate-add-rename_left
        tests/resolve_conflicts_read_all/duplicate-add-rename_right
        tests/resolve_conflicts_read_all/duplicate-adds_left
        tests/resolve_conflicts_read_all/duplicate-adds_right
        
tests/resolve_conflicts_read_all/duplicate-name-multiple-name-missing-root_left
        
tests/resolve_conflicts_read_all/duplicate-name-multiple-name-missing-root_right
        tests/resolve_conflicts_read_all/duplicate-renames_left
        tests/resolve_conflicts_read_all/duplicate-renames_right
        tests/resolve_conflicts_read_all/invalid-add_left
        tests/resolve_conflicts_read_all/invalid-add_right
        tests/resolve_conflicts_read_all/invalid-rename_left
        tests/resolve_conflicts_read_all/invalid-rename_right
        tests/resolve_conflicts_read_all/missing-root_left
        tests/resolve_conflicts_read_all/missing-root_right
        tests/resolve_conflicts_read_all/multiple-name-plus-directory-loop_left
        tests/resolve_conflicts_read_all/multiple-name-plus-directory-loop_right
        tests/resolve_conflicts_read_all/multiple-name-plus-duplicate-name_left
        tests/resolve_conflicts_read_all/multiple-name-plus-duplicate-name_right
        tests/resolve_conflicts_read_all/multiple-name-plus-orphan_left
        tests/resolve_conflicts_read_all/multiple-name-plus-orphan_right
        tests/resolve_conflicts_read_all/multiple-names_left
        tests/resolve_conflicts_read_all/multiple-names_right
        tests/resolve_conflicts_read_all/orphaned-add_left
        tests/resolve_conflicts_read_all/orphaned-add_right
        tests/resolve_conflicts_read_all/orphaned-rename_left
        tests/resolve_conflicts_read_all/orphaned-rename_right
        tests/resolve_conflicts_read_all/unrelated-projects_left
        tests/resolve_conflicts_read_all/unrelated-projects_right
Added directories:
        tests/ls_duplicates_with_duplicates
        tests/ls_duplicates_with_workspace
        tests/ls_duplicates_without_duplicates
        tests/resolve_conflicts_read_all
Modified files:
        NEWS cmd_conflicts.cc cmd_db.cc cmd_list.cc cmd_merging.cc
        merge.cc monotone.texi notes/release-checklist.txt paths.cc
        roster_merge.cc roster_merge.hh
        tests/resolve_conflicts_all_resolutions/__driver__.lua

ChangeLog: 

merge of '088382fa59d82361dff7759656e003b4a38a0a13'
     and 'd71c0ed3d94eed7804a99d5c76a3a732a35b4233'


monotone --db={your.database} diff 
--revision=088382fa59d82361dff7759656e003b4a38a0a13 
--revision=e049796e9dfbbf59177aa5f1c26a68bd23837cc2
monotone --db={your.database} diff 
--revision=d71c0ed3d94eed7804a99d5c76a3a732a35b4233 
--revision=e049796e9dfbbf59177aa5f1c26a68bd23837cc2
----------------------------------------------------------------------