[Monotone-commits-nodiffs] Revision edaa25e189d96ea4c74dd5eb8f56d9ea72230352

[monotone]

-----------------------------------------------------------------
Revision: edaa25e189d96ea4c74dd5eb8f56d9ea72230352
Ancestor: 1a8afa25119c9c88dfd031c7fd834f6f99507ecf
Ancestor: 74e7ff8292d1a351381bd878cf4e2a1029396102
Author: address@hidden
Date: 2009-01-12T03:54:20
Branch: net.venge.monotone.fast-export

Added files:
        tests/noop_merge_into_workspace/__driver__.lua
Added directories:
        tests/noop_merge_into_workspace
Modified files:
        INSTALL NEWS cmd.hh cmd_conflicts.cc cmd_db.cc
        cmd_merging.cc cmd_othervcs.cc commands.cc database.cc
        database.hh dates.cc dates.hh gettext.h monotone.cc
        monotone.texi options_list.hh po/de.po rcs_import.cc
        revision.cc roster.cc roster_merge.cc
        tests/netsync_permissions/__driver__.lua

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
1a8afa25119c9c88dfd031c7fd834f6f99507ecf)
            to branch 'net.venge.monotone.fast-export' (head 
74e7ff8292d1a351381bd878cf4e2a1029396102)


monotone --db={your.database} diff 
--revision=1a8afa25119c9c88dfd031c7fd834f6f99507ecf 
--revision=edaa25e189d96ea4c74dd5eb8f56d9ea72230352
monotone --db={your.database} diff 
--revision=74e7ff8292d1a351381bd878cf4e2a1029396102 
--revision=edaa25e189d96ea4c74dd5eb8f56d9ea72230352
----------------------------------------------------------------------