[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision 403c68d6c067b60b1fdda3c503a0f31156a57d
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision 403c68d6c067b60b1fdda3c503a0f31156a57d8a |
Date: |
Sun, 18 May 2008 17:44:08 +0200 |
-----------------------------------------------------------------
Revision: 403c68d6c067b60b1fdda3c503a0f31156a57d8a
Ancestor: 36e42dfa97c49c00b3cf13944896f335f596e871
Author: address@hidden
Date: 2008-05-18T13:47:52
Branch: net.venge.monotone.automate_show_conflict
Modified files:
revision.cc revision.hh testlib.lua
tests/automate_get_content_changed/expected
tests/automate_get_revision/expected
tests/automate_inventory_options/expected-no-ignored.stdout
tests/automate_inventory_options/expected-no-unchanged.stdout
tests/automate_inventory_options/expected-no-unknown.stdout
tests/automate_inventory_options/expected-none.stdout
tests/automate_inventory_options/expected-renames-both.stdout
tests/automate_inventory_options/expected-renames-target-no-ignored.stdout
tests/automate_inventory_options/expected-renames-target-no-unknown.stdout
tests/automate_inventory_options/expected-renames-target.stdout
tests/automate_put_revision/__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/db_rosterify_preserves_renames/expout
tests/diff_against_empty_file/expected.diff
tests/diff_on_missing_trailing_newline_at_end_of_file/file13.diff
tests/diff_on_missing_trailing_newline_at_end_of_file/file14.diff
tests/diff_on_missing_trailing_newline_at_end_of_file/file23.diff
tests/diff_on_missing_trailing_newline_at_end_of_file/file24.diff
tests/exchanging_work_via_netsync,_with_notes/testnotes.test
tests/importing_cvs_tricky_repo_with_tags/test.tags
tests/merge_into_workspace/__driver__.lua
tests/merge_into_workspace/expected-log
tests/merge_into_workspace/expected-log-left
tests/merge_into_workspace_attr_corpse/expected-roster
tests/merge_into_workspace_files_added/expected-revision
tests/merge_multiple_heads_1/__driver__.lua
tests/merge_update_part_of_file/before.diff
tests/merge_with_conflicting_name_and_renamed_dir/__driver__.lua
tests/merge_with_conflicting_name_and_renamed_dir/expected.stdout
tests/resolve_duplicate_name_conflict/__driver__.lua
tests/rosterify_on_a_db_with_an_empty_manifest/revision_good
ChangeLog:
Always use oldest possible revision_format, so regenerating old revisions
preserves the revision id. Revert affected tests.
* revision.cc (revision_t::required_revision_format): New function.
(print_insane_revision): Use it.
* revision.hh (revision_t): Declare it.
* testlib.lua (post_cmd): Add comment on why we can't do 'canonicalize'
in this function.
txt5l0AnA9JFQ.txt
Description: Diff [36e42dfa97c49c00b3cf13944896f335f596e871] -> [403c68d6c067b60b1fdda3c503a0f31156a57d8a]
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision 403c68d6c067b60b1fdda3c503a0f31156a57d8a,
monotone <=