[Monotone-commits-diffs] Revision 41934d84cde2322f36cc76c1527c5dac67319216

[monotone]

-----------------------------------------------------------------
Revision: 41934d84cde2322f36cc76c1527c5dac67319216
Ancestor: 4e8a47396734e88c3004c881a1f8749c274acbf5
Ancestor: ea88b566109e248976fe9b7e6fc11ac87fb8b16c
Author: address@hidden
Date: 2006-07-11T05:56:04
Branch: net.venge.monotone.multihead

Deleted entries:
        tests/(minor)_context_diff
        tests/(minor)_context_diff/__driver__.lua
Added files:
        randomizer.cc randomizer.hh tester.txt
        tests/automate_branches/__driver__.lua
        tests/automate_branches/ignore_branch.lua
        tests/diff_output_formats/A.cd
        tests/diff_output_formats/A.dst
        tests/diff_output_formats/A.src
        tests/diff_output_formats/A.ud
        tests/diff_output_formats/B.cd
        tests/diff_output_formats/B.dst
        tests/diff_output_formats/B.src
        tests/diff_output_formats/B.ud
        tests/diff_output_formats/C.cd
        tests/diff_output_formats/C.dst
        tests/diff_output_formats/C.src
        tests/diff_output_formats/C.ud
        tests/diff_output_formats/D.cd
        tests/diff_output_formats/D.dst
        tests/diff_output_formats/D.src
        tests/diff_output_formats/D.ud
        tests/diff_output_formats/E.cd
        tests/diff_output_formats/E.dst
        tests/diff_output_formats/E.src
        tests/diff_output_formats/E.ud
        tests/diff_output_formats/F.cd
        tests/diff_output_formats/F.dst
        tests/diff_output_formats/F.src
        tests/diff_output_formats/F.ud
        tests/diff_output_formats/G.cd
        tests/diff_output_formats/G.dst
        tests/diff_output_formats/G.src
        tests/diff_output_formats/G.ud
        tests/diff_output_formats/H.cd
        tests/diff_output_formats/H.dst
        tests/diff_output_formats/H.src
        tests/diff_output_formats/H.ud
        tests/diff_output_formats/I.cd
        tests/diff_output_formats/I.dst
        tests/diff_output_formats/I.src
        tests/diff_output_formats/I.ud
        tests/diff_output_formats/J.cd
        tests/diff_output_formats/J.dst
        tests/diff_output_formats/J.src
        tests/diff_output_formats/J.ud
        tests/diff_output_formats/__driver__.lua
        tests/diff_output_formats/hello.cd
        tests/diff_output_formats/hello.dst
        tests/diff_output_formats/hello.src
        tests/diff_output_formats/hello.ud
        tests/merge_conflict_with_no_lca/__driver__.lua
        tests/merge_conflict_with_no_lca/rcfile
        tests/merge_multiple_heads_1/__driver__.lua
        tests/pluck_basics/__driver__.lua
        tests/pluck_lifecycle/__driver__.lua
        tests/pluck_restricted/__driver__.lua testsuite.txt
Added directories:
        tests/automate_branches tests/diff_output_formats
        tests/merge_conflict_with_no_lca
        tests/merge_multiple_heads_1 tests/pluck_basics
        tests/pluck_lifecycle tests/pluck_restricted
Modified files:
        .mtn-ignore ChangeLog Makefile.am app_state.cc app_state.hh
        automate.cc charset.cc cmd_automate.cc cmd_diff_log.cc
        cmd_files.cc cmd_merging.cc commands.cc configure.ac
        contrib/ChangeLog.sh contrib/monotone.zsh_completion
        diff_patch.cc diff_patch.hh hash_map.hh lcs.cc monotone.cc
        monotone.texi netxx_pipe.cc po/de.po po/fr.po po/it.po
        po/ja.po po/pt_BR.po po/sv.po randomfile.hh refiner.cc
        refiner.hh restrictions.cc roster.cc roster.hh sanity.hh
        tester.cc tester.lua
        tests/basic_invocation_and_options/__driver__.lua
        tests/check_that_--xargs_and_-(at)_behave_correctly/__driver__.lua
        tests/checking_a_few_command_specific_options/__driver__.lua
        tests/common/cvs.lua
        tests/database_is_closed_on_signal_exit/__driver__.lua
        tests/empty_environment/__driver__.lua
        tests/fail_cleanly_on_unreadable__MTN_options/__driver__.lua
        tests/importing_cvs_files/__driver__.lua
        tests/inodeprints/__driver__.lua
        tests/test_the_help_command/__driver__.lua testsuite.lua
        unit_tests.cc unit_tests.hh unix/inodeprint.cc
        visualc/monotone.vcproj visualc/sqlite3.vcproj work.cc

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
ea88b566109e248976fe9b7e6fc11ac87fb8b16c)
            to branch 'net.venge.monotone.multihead' (head 
4e8a47396734e88c3004c881a1f8749c274acbf5)


monotone --db={your.database} diff 
--revision=4e8a47396734e88c3004c881a1f8749c274acbf5 
--revision=41934d84cde2322f36cc76c1527c5dac67319216
monotone --db={your.database} diff 
--revision=ea88b566109e248976fe9b7e6fc11ac87fb8b16c 
--revision=41934d84cde2322f36cc76c1527c5dac67319216
----------------------------------------------------------------------