[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision 25e3dd01bcd509eede943a4bb9fd4d1dfc0348
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision 25e3dd01bcd509eede943a4bb9fd4d1dfc034877 |
Date: |
Tue, 6 May 2008 08:34:42 +0200 |
-----------------------------------------------------------------
Revision: 25e3dd01bcd509eede943a4bb9fd4d1dfc034877
Ancestor: 2c67073d272d4ada7ef111e6b07b6b4f19186894
Ancestor: d59133e9c8c4c1878a08ba2bb77c1d30469bc2c6
Author: address@hidden
Date: 2008-05-05T18:57:32
Branch: net.venge.monotone.cvsimport-branch-reconstruction
Deleted entries:
tests/importing_cvs_tricky_repo_with_tags/test.manifest
tests/importing_cvs_tricky_repo_with_tags/test.tags
Added files:
tests/automate_get_options/__driver__.lua
tests/automate_show_conflicts/__driver__.lua
tests/automate_show_conflicts/expected-attribute-attached.stdout
tests/automate_show_conflicts/expected-attribute-detached.stdout
tests/automate_show_conflicts/expected-content-attached.stdout
tests/automate_show_conflicts/expected-content-detached.stdout
tests/automate_show_conflicts/expected-directory-loop.stdout
tests/automate_show_conflicts/expected-duplicate-add-rename.stdout
tests/automate_show_conflicts/expected-duplicate-adds.stdout
tests/automate_show_conflicts/expected-duplicate-name-multiple-name-missing-root.stdout
tests/automate_show_conflicts/expected-duplicate-renames.stdout
tests/automate_show_conflicts/expected-invalid-add.stdout
tests/automate_show_conflicts/expected-invalid-rename.stdout
tests/automate_show_conflicts/expected-missing-root.stdout
tests/automate_show_conflicts/expected-multiple-name-plus-directory-loop.stdout
tests/automate_show_conflicts/expected-multiple-name-plus-duplicate-name.stdout
tests/automate_show_conflicts/expected-multiple-name-plus-orphan.stdout
tests/automate_show_conflicts/expected-multiple-names.stdout
tests/automate_show_conflicts/expected-orphaned-add.stdout
tests/automate_show_conflicts/expected-orphaned-rename.stdout
tests/automate_show_conflicts/expected-unrelated-projects.stdout
tests/automate_show_conflicts_defaults/__driver__.lua
tests/importing_cvs_attic_duplicate/__driver__.lua
tests/importing_cvs_attic_duplicate/cvs-repository/test/Attic/foo,v
tests/importing_cvs_attic_duplicate/cvs-repository/test/foo,v
tests/importing_cvs_attic_duplicate/makerepo.sh
tests/importing_cvs_branch_from_empty_branch/__driver__.lua
tests/importing_cvs_branch_from_empty_branch/cvs-repository/test/fileA,v
tests/importing_cvs_branch_from_empty_branch/cvs-repository/test/fileB,v
tests/importing_cvs_branch_from_empty_branch/cvs-repository/test/fileC,v
tests/importing_cvs_branch_from_empty_branch/cvs-repository/test/fileD,v
tests/importing_cvs_branch_from_empty_branch/makerepo.sh
tests/importing_cvs_branches2/__driver__.lua
tests/importing_cvs_branches2/cvs-repository/test/Attic/file3,v
tests/importing_cvs_branches2/cvs-repository/test/changelog,v
tests/importing_cvs_branches2/cvs-repository/test/file1,v
tests/importing_cvs_branches2/cvs-repository/test/file2,v
tests/importing_cvs_branches2/makerepo.sh
tests/importing_cvs_branches3/__driver__.lua
tests/importing_cvs_branches3/cvs-repository/test/file1,v
tests/importing_cvs_branches3/cvs-repository/test/file2,v
tests/importing_cvs_branches3/makerepo.sh
tests/importing_cvs_branches4/__driver__.lua
tests/importing_cvs_branches4/cvs-repository/test/file1,v
tests/importing_cvs_branches4/cvs-repository/test/file2,v
tests/importing_cvs_branches4/makerepo.sh
tests/importing_cvs_branches5/__driver__.lua
tests/importing_cvs_branches5/cvs-repository/test/file1,v
tests/importing_cvs_branches5/cvs-repository/test/file2,v
tests/importing_cvs_branches5/makerepo.sh
tests/importing_cvs_cycle_splitter1/__driver__.lua
tests/importing_cvs_cycle_splitter1/cvs-repository/test/bar,v
tests/importing_cvs_cycle_splitter1/cvs-repository/test/foo,v
tests/importing_cvs_cycle_splitter1/makerepo.sh
tests/importing_cvs_cycle_splitter2/__driver__.lua
tests/importing_cvs_cycle_splitter2/cvs-repository/test/bar,v
tests/importing_cvs_cycle_splitter2/cvs-repository/test/foo,v
tests/importing_cvs_cycle_splitter3/__driver__.lua
tests/importing_cvs_cycle_splitter3/cvs-repository/test/file1,v
tests/importing_cvs_cycle_splitter3/cvs-repository/test/file2,v
tests/importing_cvs_dryrun/__driver__.lua
tests/importing_cvs_dryrun/cvs-repository/test/foo,v
tests/importing_cvs_dryrun/makerepo.sh
tests/importing_cvs_files_charset/__driver__.lua
tests/importing_cvs_files_charset/cvs-repository/test/foo,v
tests/importing_cvs_files_charset/makerepo.sh
tests/importing_cvs_files_with_identical_logs2/__driver__.lua
tests/importing_cvs_files_with_identical_logs2/cvs-repository/test/foo,v
tests/importing_cvs_files_with_identical_logs2/makerepo.sh
tests/importing_cvs_files_with_identical_logs3/__driver__.lua
tests/importing_cvs_files_with_identical_logs3/cvs-repository/test/foo,v
tests/importing_cvs_files_with_identical_logs3/makerepo.sh
tests/importing_cvs_files_with_identical_time/__driver__.lua
tests/importing_cvs_files_with_identical_time/cvs-repository/test/foo,v
tests/importing_cvs_ignore_symbol/__driver__.lua
tests/importing_cvs_ignore_symbol/cvs-repository/test/foo,v
tests/importing_cvs_ignore_symbol/ignhook.lua
tests/importing_cvs_ignore_symbol/makerepo.sh
tests/importing_cvs_missing_delta_1/__driver__.lua
tests/importing_cvs_missing_delta_1/cvs-repository/fileA,v
tests/importing_cvs_missing_delta_2/__driver__.lua
tests/importing_cvs_missing_delta_2/cvs-repository/test/foo,v
tests/importing_cvs_successive/__driver__.lua
tests/importing_cvs_successive/cvs-repository/test/file1,v
tests/importing_cvs_successive/cvs-repository/test/file2,v
tests/importing_cvs_successive/cvs-repository-snap/test/file1,v
tests/importing_cvs_successive/cvs-repository-snap/test/file2,v
tests/importing_cvs_successive/makerepo.sh
tests/importing_cvs_timing_check/__driver__.lua
tests/importing_cvs_timing_check/cvs-repository/test/bar,v
tests/importing_cvs_timing_check/cvs-repository/test/foo,v
tests/importing_cvs_timing_check/makerepo.sh
tests/importing_cvs_with_conflicting_tag/__driver__.lua
tests/importing_cvs_with_conflicting_tag/cvs-repository/testsrc/fileA,v
tests/importing_cvs_with_conflicting_tag/cvs-repository/testsrc/fileB,v
tests/importing_cvs_with_conflicting_tag2/__driver__.lua
tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileA,v
tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileB,v
tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileC,v
tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileD,v
tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileE,v
tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileF,v
tests/importing_cvs_with_conflicting_tag2/makerepo.sh
tests/importing_cvs_with_conflicting_tag3/__driver__.lua
tests/importing_cvs_with_conflicting_tag3/cvs-repository/test/file1,v
tests/importing_cvs_with_conflicting_tag3/cvs-repository/test/file2,v
tests/importing_cvs_with_conflicting_tag3/makerepo.sh
tests/importing_cvs_with_multiple_unnamed_branches/__driver__.lua
tests/importing_cvs_with_multiple_unnamed_branches/cvs-repository/fileA,v
tests/importing_cvs_with_multiple_vendor_imports/__driver__.lua
tests/importing_cvs_with_multiple_vendor_imports/cvs-repository/test/fileA,v
tests/importing_cvs_with_multiple_vendor_imports/cvs-repository/test/fileB,v
tests/importing_cvs_with_multiple_vendor_imports/cvs-repository/test/fileC,v
tests/importing_cvs_with_multiple_vendor_imports/makerepo.sh
tests/importing_cvs_with_multiple_vendor_imports2/__driver__.lua
tests/importing_cvs_with_multiple_vendor_imports2/cvs-repository/test/fileA,v
tests/importing_cvs_with_multiple_vendor_imports2/cvs-repository/test/fileB,v
tests/importing_cvs_with_multiple_vendor_imports2/cvs-repository/test/fileC,v
tests/importing_cvs_with_multiple_vendor_imports2/makerepo.sh
tests/importing_cvs_with_tags_after_delete/__driver__.lua
tests/importing_cvs_with_tags_after_delete/cvs-repository/test/Attic/bar,v
tests/importing_cvs_with_tags_after_delete/cvs-repository/test/foo,v
tests/importing_cvs_with_tags_after_delete/makerepo.sh
tests/importing_cvs_with_tags_after_delete2/__driver__.lua
tests/importing_cvs_with_tags_after_delete2/cvs-repository/test/Attic/bar,v
tests/importing_cvs_with_tags_after_delete2/cvs-repository/test/foo,v
tests/importing_cvs_with_unnamed_branch/__driver__.lua
tests/importing_cvs_with_unnamed_branch/cvs-repository/fileA,v
tests/merge_with_conflicting_name_and_renamed_dir/expected.stdout
tests/resolve_duplicate_name_conflict/__driver__.lua
Added directories:
tests/automate_get_options tests/automate_show_conflicts
tests/automate_show_conflicts_defaults
tests/importing_cvs_attic_duplicate
tests/importing_cvs_attic_duplicate/cvs-repository
tests/importing_cvs_attic_duplicate/cvs-repository/test
tests/importing_cvs_attic_duplicate/cvs-repository/test/Attic
tests/importing_cvs_branch_from_empty_branch
tests/importing_cvs_branch_from_empty_branch/cvs-repository
tests/importing_cvs_branch_from_empty_branch/cvs-repository/test
tests/importing_cvs_branches2
tests/importing_cvs_branches2/cvs-repository
tests/importing_cvs_branches2/cvs-repository/test
tests/importing_cvs_branches2/cvs-repository/test/Attic
tests/importing_cvs_branches3
tests/importing_cvs_branches3/cvs-repository
tests/importing_cvs_branches3/cvs-repository/test
tests/importing_cvs_branches4
tests/importing_cvs_branches4/cvs-repository
tests/importing_cvs_branches4/cvs-repository/test
tests/importing_cvs_branches5
tests/importing_cvs_branches5/cvs-repository
tests/importing_cvs_branches5/cvs-repository/test
tests/importing_cvs_cycle_splitter1
tests/importing_cvs_cycle_splitter1/cvs-repository
tests/importing_cvs_cycle_splitter1/cvs-repository/test
tests/importing_cvs_cycle_splitter2
tests/importing_cvs_cycle_splitter2/cvs-repository
tests/importing_cvs_cycle_splitter2/cvs-repository/test
tests/importing_cvs_cycle_splitter3
tests/importing_cvs_cycle_splitter3/cvs-repository
tests/importing_cvs_cycle_splitter3/cvs-repository/test
tests/importing_cvs_dryrun
tests/importing_cvs_dryrun/cvs-repository
tests/importing_cvs_dryrun/cvs-repository/test
tests/importing_cvs_files_charset
tests/importing_cvs_files_charset/cvs-repository
tests/importing_cvs_files_charset/cvs-repository/test
tests/importing_cvs_files_with_identical_logs2
tests/importing_cvs_files_with_identical_logs2/cvs-repository
tests/importing_cvs_files_with_identical_logs2/cvs-repository/test
tests/importing_cvs_files_with_identical_logs3
tests/importing_cvs_files_with_identical_logs3/cvs-repository
tests/importing_cvs_files_with_identical_logs3/cvs-repository/test
tests/importing_cvs_files_with_identical_time
tests/importing_cvs_files_with_identical_time/cvs-repository
tests/importing_cvs_files_with_identical_time/cvs-repository/test
tests/importing_cvs_ignore_symbol
tests/importing_cvs_ignore_symbol/cvs-repository
tests/importing_cvs_ignore_symbol/cvs-repository/test
tests/importing_cvs_missing_delta_1
tests/importing_cvs_missing_delta_1/cvs-repository
tests/importing_cvs_missing_delta_2
tests/importing_cvs_missing_delta_2/cvs-repository
tests/importing_cvs_missing_delta_2/cvs-repository/test
tests/importing_cvs_successive
tests/importing_cvs_successive/cvs-repository
tests/importing_cvs_successive/cvs-repository/test
tests/importing_cvs_successive/cvs-repository-snap
tests/importing_cvs_successive/cvs-repository-snap/test
tests/importing_cvs_timing_check
tests/importing_cvs_timing_check/cvs-repository
tests/importing_cvs_timing_check/cvs-repository/test
tests/importing_cvs_with_conflicting_tag
tests/importing_cvs_with_conflicting_tag/cvs-repository
tests/importing_cvs_with_conflicting_tag/cvs-repository/testsrc
tests/importing_cvs_with_conflicting_tag2
tests/importing_cvs_with_conflicting_tag2/cvs-repository
tests/importing_cvs_with_conflicting_tag2/cvs-repository/test
tests/importing_cvs_with_conflicting_tag3
tests/importing_cvs_with_conflicting_tag3/cvs-repository
tests/importing_cvs_with_conflicting_tag3/cvs-repository/test
tests/importing_cvs_with_multiple_unnamed_branches
tests/importing_cvs_with_multiple_unnamed_branches/cvs-repository
tests/importing_cvs_with_multiple_vendor_imports
tests/importing_cvs_with_multiple_vendor_imports/cvs-repository
tests/importing_cvs_with_multiple_vendor_imports/cvs-repository/test
tests/importing_cvs_with_multiple_vendor_imports2
tests/importing_cvs_with_multiple_vendor_imports2/cvs-repository
tests/importing_cvs_with_multiple_vendor_imports2/cvs-repository/test
tests/importing_cvs_with_tags_after_delete
tests/importing_cvs_with_tags_after_delete/cvs-repository
tests/importing_cvs_with_tags_after_delete/cvs-repository/test
tests/importing_cvs_with_tags_after_delete/cvs-repository/test/Attic
tests/importing_cvs_with_tags_after_delete2
tests/importing_cvs_with_tags_after_delete2/cvs-repository
tests/importing_cvs_with_tags_after_delete2/cvs-repository/test
tests/importing_cvs_with_tags_after_delete2/cvs-repository/test/Attic
tests/importing_cvs_with_unnamed_branch
tests/importing_cvs_with_unnamed_branch/cvs-repository
tests/resolve_duplicate_name_conflict
Modified files:
AUTHORS NEWS automate.cc cmd_automate.cc cmd_merging.cc
cmd_othervcs.cc contrib/monotone.bash_completion dates.cc
dates.hh diff_patch.cc diff_patch.hh
examples/display_branches.lua lua-testsuite.lua lua_hooks.cc
lua_hooks.hh merge.cc monotone.texi options_list.hh paths.cc
rcs_file.cc rcs_file.hh rcs_import.cc rcs_import.hh
roster_merge.cc roster_merge.hh
tests/automate_cert/__driver__.lua
tests/automate_heads/__driver__.lua
tests/automate_keys/__driver__.lua
tests/common/test_utils_inventory.lua
tests/conflict_messages/__driver__.lua
tests/importing_cvs_branches/__driver__.lua
tests/importing_cvs_small_real_repo/test.manifest
tests/importing_cvs_tricky_repo_with_tags/__driver__.lua
tests/merge_with_conflicting_name_and_renamed_dir/__driver__.lua
tests/util_mtnopt/__driver__.lua
Modified attrs:
tests/importing_cvs_attic_duplicate/makerepo.sh
tests/importing_cvs_branch_from_empty_branch/makerepo.sh
tests/importing_cvs_branches2/makerepo.sh
tests/importing_cvs_branches3/makerepo.sh
tests/importing_cvs_branches4/makerepo.sh
tests/importing_cvs_branches5/makerepo.sh
tests/importing_cvs_cycle_splitter1/makerepo.sh
tests/importing_cvs_dryrun/makerepo.sh
tests/importing_cvs_files_charset/makerepo.sh
tests/importing_cvs_files_with_identical_logs2/makerepo.sh
tests/importing_cvs_files_with_identical_logs3/makerepo.sh
tests/importing_cvs_ignore_symbol/makerepo.sh
tests/importing_cvs_successive/makerepo.sh
tests/importing_cvs_timing_check/makerepo.sh
tests/importing_cvs_with_conflicting_tag2/makerepo.sh
tests/importing_cvs_with_conflicting_tag3/makerepo.sh
tests/importing_cvs_with_multiple_vendor_imports/makerepo.sh
tests/importing_cvs_with_multiple_vendor_imports2/makerepo.sh
tests/importing_cvs_with_tags_after_delete/makerepo.sh
ChangeLog:
propagate from branch 'net.venge.monotone' (head
d59133e9c8c4c1878a08ba2bb77c1d30469bc2c6)
to branch 'net.venge.monotone.cvsimport-branch-reconstruction'
(head 2c67073d272d4ada7ef111e6b07b6b4f19186894)
monotone --db={your.database} diff
--revision=2c67073d272d4ada7ef111e6b07b6b4f19186894
--revision=25e3dd01bcd509eede943a4bb9fd4d1dfc034877
monotone --db={your.database} diff
--revision=d59133e9c8c4c1878a08ba2bb77c1d30469bc2c6
--revision=25e3dd01bcd509eede943a4bb9fd4d1dfc034877
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision 25e3dd01bcd509eede943a4bb9fd4d1dfc034877,
monotone <=