[Monotone-commits-diffs] Revision e9c6263a744b822868e50112d64ab0427db94594

[monotone]

-----------------------------------------------------------------
Revision: e9c6263a744b822868e50112d64ab0427db94594
Ancestor: b1d141a9ffd89b472ec209f7c6e6ab452d59532f
Ancestor: ba0cd06c85a2290ea6c650f85e9af5d0187c808b
Author: Thomas Moschny <address@hidden>
Date: 2007-02-10T23:51:08
Branch: net.venge.monotone.experiment.annotate.roster_deltas

Deleted entries:
        ChangeLog
Added files:
        ChangeLog tests/locked_workspace/__driver__.lua
Added directories:
        tests/locked_workspace
Modified files:
        annotate.cc cmd.hh cmd_merging.cc cmd_ws_commit.cc
        commands.cc database.cc database.hh file_io.cc netio.hh
        po/it.po po/sv.po roster_delta.cc roster_delta.hh
        tests/(imp)_deleting_directories/__driver__.lua
        tests/(imp)_merge((patch_foo_a),_(delete_foo_))/__driver__.lua
        tests/a_tricky_cvs_repository_with_tags/__driver__.lua
        tests/attr_command_in_subdirs/__driver__.lua
        tests/attr_set_get_commands/__driver__.lua
        tests/checkout_creates__MTN_log/__driver__.lua
        tests/checkout_does_not_clobber_workspace/__driver__.lua
        tests/delete_work_file_on_checkout/__driver__.lua
        tests/diff_shows_renames/__driver__.lua
        tests/importing_a_small,_real_cvs_repository/__driver__.lua
        tests/merge((patch_foo_a),_(rename_foo__bar_))/__driver__.lua
        
tests/merge_a_project_into_a_subdirectory_of_an_unrelated_project/__driver__.lua
        tests/merging_(add_a)_with_(add_a,_drop_a)/__driver__.lua
        tests/merging_an_add_edge/__driver__.lua
        tests/multiple_version_committing/__driver__.lua
        tests/persistent_netsync_server_-_revs_&_certs/__driver__.lua
        tests/rename_dir_to_non-sibling/__driver__.lua
        tests/selecting_arbitrary_certs/__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
        tests/test_annotate_command/__driver__.lua
        tests/update_updates_inodeprints/__driver__.lua
        testsuite.lua win32/fs.cc work.cc work.hh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
b1d141a9ffd89b472ec209f7c6e6ab452d59532f)
            to branch 'net.venge.monotone.experiment.annotate.roster_deltas' 
(head ba0cd06c85a2290ea6c650f85e9af5d0187c808b)


monotone --db={your.database} diff 
--revision=b1d141a9ffd89b472ec209f7c6e6ab452d59532f 
--revision=e9c6263a744b822868e50112d64ab0427db94594
monotone --db={your.database} diff 
--revision=ba0cd06c85a2290ea6c650f85e9af5d0187c808b 
--revision=e9c6263a744b822868e50112d64ab0427db94594
----------------------------------------------------------------------