[Monotone-commits-diffs] Revision f0a632bf14468b6e03a488d6f1a64ef18b61d04c

[monotone]

-----------------------------------------------------------------
Revision: f0a632bf14468b6e03a488d6f1a64ef18b61d04c
Ancestor: 381d5cc0ea5692860b5363dfca3df433b32e63fe
Ancestor: 883ff08282c351c5d3e2ac8ec9f25cea4435bf44
Author: address@hidden
Date: 2005-09-04T21:44:24
Branch: net.venge.monotone

Added files:
        tests/t_automate_get_file.at
        tests/t_automate_get_manifest.at
        tests/t_automate_get_revision.at
Modified files:
        ChangeLog annotate.cc automate.cc basic_io.cc commands.cc
        monotone.cc monotone.texi netsync.cc po/Makevars
        tests/t_add_edge.at tests/t_add_stomp_file.at
        tests/t_add_vs_commit.at tests/t_cat_file_by_name.at
        tests/t_change_empty_file.at tests/t_cvsimport.at
        tests/t_cvsimport_deleted_invar.at
        tests/t_cvsimport_drepper.at tests/t_cvsimport_drepper2.at
        tests/t_cvsimport_manifest_cycle.at
        tests/t_cvsimport_samelog.at tests/t_database_check.at
        tests/t_db_kill_rev_locally.at
        tests/t_empty_id_completion.at tests/t_epoch.at
        tests/t_epoch_server.at tests/t_erename.at
        tests/t_i18n_file.at tests/t_import.at
        tests/t_merge_add_del.at tests/t_movedel.at
        tests/t_movepatch.at tests/t_netsync.at
        tests/t_netsync_exclude.at
        tests/t_netsync_exclude_default.at tests/t_netsync_globs.at
        tests/t_netsync_nocerts.at tests/t_netsync_permissions.at
        tests/t_netsync_read_permissions.at
        tests/t_netsync_single.at tests/t_netsync_unrelated.at
        tests/t_normalized_filenames.at
        tests/t_persistent_server_keys_2.at
        tests/t_persistent_server_revision.at tests/t_remerge.at
        tests/t_rename.at tests/t_renamed.at tests/t_scan.at
        tests/t_set_default.at tests/t_singlecvs.at
        tests/t_update_with_pending_add.at
        tests/t_update_with_pending_drop.at
        tests/t_update_with_pending_rename.at tests/t_versions.at
        testsuite.at

ChangeLog: 

explicit_merge of 381d5cc0ea5692860b5363dfca3df433b32e63fe
              and 883ff08282c351c5d3e2ac8ec9f25cea4435bf44
   using ancestor d74a41814b245eeb349f70a5f6aad3214f1379ee
        to branch 'net.venge.monotone'


monotone --db={your.database} diff 
--revision=381d5cc0ea5692860b5363dfca3df433b32e63fe 
--revision=f0a632bf14468b6e03a488d6f1a64ef18b61d04c
monotone --db={your.database} diff 
--revision=883ff08282c351c5d3e2ac8ec9f25cea4435bf44 
--revision=f0a632bf14468b6e03a488d6f1a64ef18b61d04c
----------------------------------------------------------------------