[Monotone-commits-diffs] Revision 82e37a04da2c85568d81db8cb706c69988d5dc0e

[monotone]

-----------------------------------------------------------------
Revision: 82e37a04da2c85568d81db8cb706c69988d5dc0e
Ancestor: 3ac8900051aff141f15218f5cf1723413d618906
Ancestor: 73d0c6ab78eee0446b13f9334490271bb4b51c35
Author: address@hidden
Date: 2007-02-06T21:16:55
Branch: net.venge.monotone.experiment.annotate.roster_deltas

Added files:
        tests/test_a_merge_8/__driver__.lua
        tests/test_a_merge_8/correct tests/test_a_merge_8/left
        tests/test_a_merge_8/parent tests/test_a_merge_8/right
Added directories:
        tests/test_a_merge_8
Modified files:
        ChangeLog annotate.cc cmd_diff_log.cc contrib/monotone.el
        database.cc database.hh file_io.cc file_io.hh mtn.1 po/it.po
        po/sv.po roster_delta.cc roster_delta.hh std_hooks.lua
        tests/addition_of_files_and_directories/__driver__.lua
        tests/ls_unknown_in_subdir/__driver__.lua
        tests/ls_unknown_of_unknown_subdir/__driver__.lua
        tests/things_in_.mtn-ignore_get_ignored/__driver__.lua
        testsuite.lua work.cc

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
73d0c6ab78eee0446b13f9334490271bb4b51c35)
            to branch 'net.venge.monotone.experiment.annotate.roster_deltas' 
(head 3ac8900051aff141f15218f5cf1723413d618906)


monotone --db={your.database} diff 
--revision=3ac8900051aff141f15218f5cf1723413d618906 
--revision=82e37a04da2c85568d81db8cb706c69988d5dc0e
monotone --db={your.database} diff 
--revision=73d0c6ab78eee0446b13f9334490271bb4b51c35 
--revision=82e37a04da2c85568d81db8cb706c69988d5dc0e
----------------------------------------------------------------------