[Monotone-commits-diffs] Revision 045b74fe061d4fb0925f7c6b0ca1fd61340bca87

[monotone]

-----------------------------------------------------------------
Revision: 045b74fe061d4fb0925f7c6b0ca1fd61340bca87
Ancestor: 1992323b917a7e8d0bd4d2266d8e7ba4cb081979
Ancestor: 8e31c7bd779710254b1d0425c0e35bc98598d813
Author: address@hidden
Date: 2008-05-17T18:58:52
Branch: net.venge.monotone.automate_show_conflict

Added files:
        tests/automate_inventory_ignore_dirs/expected_2.stderr
        tests/automate_inventory_ignore_dirs/expected_2.stdout
        tests/resolve_duplicate_name_conflict/checkout.sh-merged
        tests/resolve_duplicate_name_conflict/conflicts-resolved
Modified files:
        HACKING asciik.cc automate.cc basic_io.cc basic_io.hh
        cmd_merging.cc contrib/monotone.bash_completion cset.cc
        cset.hh database.cc examples/display_branches.lua
        lru_writeback_cache.hh luaext_parse_basic_io.cc merge.cc
        merge.hh monotone.texi netsync.cc options_list.hh paths.cc
        po/de.po po/es.po po/sv.po roster.cc roster.hh
        roster_merge.cc roster_merge.hh tester.cc
        tests/automate_inventory_ignore_dirs/__driver__.lua
        tests/automate_inventory_ignore_dirs/expected.stderr
        tests/automate_inventory_ignore_dirs/local_hooks.lua
        tests/common/test_utils_inventory.lua
        tests/resolve_duplicate_name_conflict/__driver__.lua
        tests/util_mtnopt/__driver__.lua

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
1992323b917a7e8d0bd4d2266d8e7ba4cb081979)
            to branch 'net.venge.monotone.automate_show_conflict' (head 
8e31c7bd779710254b1d0425c0e35bc98598d813)


monotone --db={your.database} diff 
--revision=1992323b917a7e8d0bd4d2266d8e7ba4cb081979 
--revision=045b74fe061d4fb0925f7c6b0ca1fd61340bca87
monotone --db={your.database} diff 
--revision=8e31c7bd779710254b1d0425c0e35bc98598d813 
--revision=045b74fe061d4fb0925f7c6b0ca1fd61340bca87
----------------------------------------------------------------------