[Monotone-commits-diffs] Revision fe09b5e71606e2f2078ccfc5e295588d1fdedd72

[monotone]

-----------------------------------------------------------------
Revision: fe09b5e71606e2f2078ccfc5e295588d1fdedd72
Ancestor: 8365727b69c02fcb3b468988eb27866c6d20bc56
Ancestor: bc23305f97c1e2b0de46ee584bc327c5fff56f2d
Author: address@hidden
Date: 2009-08-29T11:52:36
Branch: net.venge.monotone.stephe

Added files:
        tests/move_conflicting_unversioned/__driver__.lua
        tests/resolve_conflicts_orphaned_file/__driver__.lua
        tests/skip_invalid_paths/__driver__.lua
Added directories:
        tests/move_conflicting_unversioned
        tests/resolve_conflicts_orphaned_file
        tests/skip_invalid_paths
Modified files:
        INSTALL NEWS charset.hh cmd_conflicts.cc cmd_merging.cc
        cmd_ws_commit.cc file_io.cc merge_conflict.cc
        merge_content.cc merge_roster.cc merge_roster.hh
        monotone.texi netxx_pipe.cc options_list.hh paths.cc
        paths.hh rcs_import.cc
        tests/resolve_conflicts_all_resolutions/conflicts-resolved
        tests/resolve_conflicts_content/conflicts-2
        tests/resolve_conflicts_read_all/missing-root_left
        tests/resolve_conflicts_read_all/missing-root_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
        unix/terminal.cc unix/tester-plaf.cc win32/README
        win32/monotone.iss win32/terminal.cc work.cc work.hh

ChangeLog: 

explicit merge of 'bc23305f97c1e2b0de46ee584bc327c5fff56f2d'
              and '8365727b69c02fcb3b468988eb27866c6d20bc56'


monotone --db={your.database} diff 
--revision=8365727b69c02fcb3b468988eb27866c6d20bc56 
--revision=fe09b5e71606e2f2078ccfc5e295588d1fdedd72
monotone --db={your.database} diff 
--revision=bc23305f97c1e2b0de46ee584bc327c5fff56f2d 
--revision=fe09b5e71606e2f2078ccfc5e295588d1fdedd72
----------------------------------------------------------------------