[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision 0f0e4c39ab893c4920e805438585ce9e28caff
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision 0f0e4c39ab893c4920e805438585ce9e28caffdd |
Date: |
Mon, 7 Jan 2008 13:05:35 +0100 |
-----------------------------------------------------------------
Revision: 0f0e4c39ab893c4920e805438585ce9e28caffdd
Ancestor: 4f94ee725575b15618133595287daaeda24f0236
Ancestor: 9e47bed9bde4f73e0770762ea1aa9adb3b434e09
Author: address@hidden
Date: 2007-12-20T17:27:57
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
tests/show_conflicts tests/show_conflicts/__driver__.lua
Added files:
tests/conflict_messages/__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_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_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_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
Added directories:
tests/conflict_messages 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_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_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_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
Modified files:
AUTHORS NEWS cmd_diff_log.cc cmd_merging.cc cmd_netsync.cc
cmd_othervcs.cc cmd_ws_commit.cc diff_patch.cc diff_patch.hh
merge.cc paths.hh rcs_file.cc rcs_file.hh rcs_import.cc
roster.cc roster.hh roster_merge.cc roster_merge.hh
sanity.hh tests/command_completion/__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
work.cc
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_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
4f94ee725575b15618133595287daaeda24f0236)
to branch 'net.venge.monotone.cvsimport-branch-reconstruction'
(head 9e47bed9bde4f73e0770762ea1aa9adb3b434e09)
monotone --db={your.database} diff
--revision=4f94ee725575b15618133595287daaeda24f0236
--revision=0f0e4c39ab893c4920e805438585ce9e28caffdd
monotone --db={your.database} diff
--revision=9e47bed9bde4f73e0770762ea1aa9adb3b434e09
--revision=0f0e4c39ab893c4920e805438585ce9e28caffdd
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision 0f0e4c39ab893c4920e805438585ce9e28caffdd,
monotone <=