[Monotone-commits-diffs] Revision 5a64b48080a06d9b848f81738f7de65eceab9322

[monotone]

-----------------------------------------------------------------
Revision: 5a64b48080a06d9b848f81738f7de65eceab9322
Ancestor: 879c12d502bafeb14d1b09178d4a40503a91bb4b
Ancestor: c7429c8bd238375cac6d148ba0377f45be94d2bf
Author: address@hidden
Date: 2007-03-12T08:16:15
Branch: net.venge.monotone

Renamed entries:
        tests/a_tricky_cvs_repository_with_tags to 
tests/importing_cvs_tricky_repo_with_tags
        tests/cvs_import,_deleted_file_invariant to 
tests/importing_cvs_deleted_file
        tests/cvs_import,_file_dead_on_head_and_branch to 
tests/importing_cvs_file_dead_on_head_and_branch
        tests/cvs_import_with_file_added_on_a_branch to 
tests/importing_cvs_file_added_on_a_branch
        tests/importing_a_cvs_file_with_one_version to 
tests/importing_cvs_file_with_one_version
        tests/importing_a_small,_real_cvs_repository to 
tests/importing_cvs_small_real_repo
        tests/importing_cvs_branches_with_correct_ancestory to 
tests/importing_cvs_branches
        tests/test_problematic_cvs_import to 
tests/importing_cvs_problematic_repo
Added files:
        m4/iconv_translit.m4
        tests/defecting_attributes/__driver__.lua
Added directories:
        tests/defecting_attributes
Modified files:
        charset.cc cmd_key_cert.cc cmd_merging.cc configure.ac
        idna/stringprep.h idna/toutf8.c monotone.texi po/es.po
        po/sv.po
        tests/changing_passphrase_of_a_private_key/__driver__.lua

ChangeLog: 

merge of '879c12d502bafeb14d1b09178d4a40503a91bb4b'
     and 'c7429c8bd238375cac6d148ba0377f45be94d2bf'


monotone --db={your.database} diff 
--revision=879c12d502bafeb14d1b09178d4a40503a91bb4b 
--revision=5a64b48080a06d9b848f81738f7de65eceab9322
monotone --db={your.database} diff 
--revision=c7429c8bd238375cac6d148ba0377f45be94d2bf 
--revision=5a64b48080a06d9b848f81738f7de65eceab9322
----------------------------------------------------------------------