monotone-commits-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] Revision 58281851ea02ffcb29ec209c4a11ff4e5bade6


From: monotone
Subject: [Monotone-commits-diffs] Revision 58281851ea02ffcb29ec209c4a11ff4e5bade62c
Date: Tue, 11 Jul 2006 16:09:25 +0200

-----------------------------------------------------------------
Revision: 58281851ea02ffcb29ec209c4a11ff4e5bade62c
Ancestor: 049b296370c44ff7c6a09e22641cebf30c0ae0b4
Ancestor: 23ef039d5c7a4b5d78b0fa14e3879eaf79634170
Author: address@hidden
Date: 2006-07-10T02:03:47
Branch: net.venge.monotone.cvsimport-branch-reconstruction

Deleted entries:
        tests/(minor)_context_diff
        tests/(minor)_context_diff/__driver__.lua
Added files:
        randomizer.cc randomizer.hh 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/pluck_basics/__driver__.lua
        tests/pluck_lifecycle/__driver__.lua
        tests/pluck_restricted/__driver__.lua
        tests/t_cvsimport_branch2.at
Added directories:
        tests/diff_output_formats tests/merge_conflict_with_no_lca
        tests/pluck_basics tests/pluck_lifecycle
        tests/pluck_restricted
Modified files:
        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 contrib/ChangeLog.sh
        diff_patch.cc diff_patch.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 rcs_import.cc refiner.cc
        refiner.hh roster.cc roster.hh tester.cc tester.lua
        tester.txt 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/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 
23ef039d5c7a4b5d78b0fa14e3879eaf79634170)
            to branch 'net.venge.monotone.cvsimport-branch-reconstruction' 
(head 049b296370c44ff7c6a09e22641cebf30c0ae0b4)


monotone --db={your.database} diff 
--revision=049b296370c44ff7c6a09e22641cebf30c0ae0b4 
--revision=58281851ea02ffcb29ec209c4a11ff4e5bade62c
monotone --db={your.database} diff 
--revision=23ef039d5c7a4b5d78b0fa14e3879eaf79634170 
--revision=58281851ea02ffcb29ec209c4a11ff4e5bade62c
----------------------------------------------------------------------




reply via email to

[Prev in Thread] Current Thread [Next in Thread]