Martin von Zweigbergk 61501db8ec merged_trees: consider conflict-format-change-only commits empty ... When we start writing tree-level conflicts in an existing repo, we don't want commits that change the format to be non-empty if they don't change any content. This patch updates `MergeTreeId::eq()` to consider two resolved trees equal even if only their `MergedTreeId` variant is different (one is path-level and one is tree-level). I think I've gone through all places we compare tree ids and checked that it's safe to compare them this way. One consequence is that rebasing a commit without changing the parents (typically auto-rebasing after `jj describe`) will not lead to the tree id getting upgraded, due to an optimization we have for that case. I don't think that's serious enough to handle specially; we'll have to support the old format for existing repos for a while regardless of a few commits not getting upgraded right away. The number of failing tests with the config option enabled drop from 108 to 11 with this patch.		2023-08-30 06:17:21 -07:00
..
common	cli tests: Move current_operation_id to test_utils	2023-08-22 17:39:56 -07:00
test_abandon_command.rs	cli templates: include branches in short commit description	2023-08-10 20:58:40 -07:00
test_alias.rs	cli: hide irrelevant information about root commit in default log templates	2023-08-15 18:54:59 +03:00
test_branch_command.rs	index: import commits in chronological order	2023-08-15 15:03:45 +09:00
test_cat_command.rs	tests: move tests/ under cli/ so they're run again	2023-08-05 06:18:59 +00:00
test_checkout.rs	tests: move tests/ under cli/ so they're run again	2023-08-05 06:18:59 +00:00
test_chmod_command.rs	cli: say that jj chmod errors out if there are any non-file sides	2023-08-14 18:15:34 -07:00
test_commit_command.rs	cli: add support for setting default description	2023-08-13 23:59:15 +05:30
test_commit_template.rs	templates: default placeholders to red	2023-08-30 12:54:15 +08:00
test_concurrent_operations.rs	tests: move tests/ under cli/ so they're run again	2023-08-05 06:18:59 +00:00
test_config_command.rs	cleanup: fix warnings from nightly clippy	2023-08-14 22:11:56 -07:00
test_debug_command.rs	tests: move tests/ under cli/ so they're run again	2023-08-05 06:18:59 +00:00
test_describe_command.rs	cli: add support for setting default description	2023-08-13 23:59:15 +05:30
test_diff_command.rs	Add jj diffs --stat option	2023-08-19 23:49:16 -07:00
test_diffedit_command.rs	merge_tools: Allow 3-pane diff editing	2023-08-21 20:19:15 -07:00
test_duplicate_command.rs	cleanup: fix warnings from nightly clippy	2023-08-14 22:11:56 -07:00
test_edit_command.rs	tests: move tests/ under cli/ so they're run again	2023-08-05 06:18:59 +00:00
test_git_clone.rs	cleanup: fix warnings from nightly clippy	2023-08-14 22:11:56 -07:00
test_git_colocated.rs	cleanup: fix warnings from nightly clippy	2023-08-14 22:11:56 -07:00
test_git_fetch.rs	git: do not import refs from remote named "git"	2023-08-29 22:50:46 +09:00
test_git_import_export.rs	cli tests: Move current_operation_id to test_utils	2023-08-22 17:39:56 -07:00
test_git_push.rs	cli: make jj git push default to -r 'remote_branches()..@'	2023-08-23 15:00:03 -07:00
test_git_remotes.rs	git: prohibit creation of remote named "git"	2023-08-29 22:50:46 +09:00
test_git_submodule.rs	tests: move tests/ under cli/ so they're run again	2023-08-05 06:18:59 +00:00
test_gitignores.rs	tests: move tests/ under cli/ so they're run again	2023-08-05 06:18:59 +00:00
test_global_opts.rs	Enable wrapping help in clap	2023-08-22 22:24:03 -07:00
test_init_command.rs	cli: hide irrelevant information about root commit in default log templates	2023-08-15 18:54:59 +03:00
test_interdiff_command.rs	diff_util: use MergedTree throughout	2023-08-27 07:50:28 -07:00
test_log_command.rs	templater: make .short(negative_len) return 0-length string	2023-08-25 22:59:20 +09:00
test_move_command.rs	cli templates: include branches in short commit description	2023-08-10 20:58:40 -07:00
test_new_command.rs	cli templates: include branches in short commit description	2023-08-10 20:58:40 -07:00
test_obslog_command.rs	diff_util: use MergedTree throughout	2023-08-27 07:50:28 -07:00
test_operations.rs	templater: make .short(negative_len) return 0-length string	2023-08-25 22:59:20 +09:00
test_rebase_command.rs	cli templates: include branches in short commit description	2023-08-10 20:58:40 -07:00
test_resolve_command.rs	cli templates: include branches in short commit description	2023-08-10 20:58:40 -07:00
test_restore_command.rs	cli templates: include branches in short commit description	2023-08-10 20:58:40 -07:00
test_revset_output.rs	revset: add literal:"string" pattern syntax	2023-08-17 07:42:12 +09:00
test_show_command.rs	tests: move tests/ under cli/ so they're run again	2023-08-05 06:18:59 +00:00
test_sparse_command.rs	tests: move tests/ under cli/ so they're run again	2023-08-05 06:18:59 +00:00
test_split_command.rs	cli: when splitting change without description, skip it on second part	2023-08-15 10:12:12 -07:00
test_squash_command.rs	cli templates: include branches in short commit description	2023-08-10 20:58:40 -07:00
test_status_command.rs	Fix .gitignore handling of ignored directories	2023-08-22 22:08:32 -07:00
test_templater.rs	templater: move empty signature placeholder to user template	2023-08-27 09:38:36 +09:00
test_tree_level_conflicts.rs	merged_trees: consider conflict-format-change-only commits empty	2023-08-30 06:17:21 -07:00
test_undo.rs	cli tests: Move current_operation_id to test_utils	2023-08-22 17:39:56 -07:00
test_unsquash_command.rs	cli templates: include branches in short commit description	2023-08-10 20:58:40 -07:00
test_untrack_command.rs	tests: move tests/ under cli/ so they're run again	2023-08-05 06:18:59 +00:00
test_util_command.rs	tests: move tests/ under cli/ so they're run again	2023-08-05 06:18:59 +00:00
test_workspaces.rs	revset: resolve "@" symbol's workspace id earlier (while parsing)	2023-08-20 17:57:18 -07:00