mirror of
https://github.com/martinvonz/jj.git
synced 2024-12-31 16:40:22 +00:00
61501db8ec
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. |
||
|---|---|---|
| .. | ||
| common | ||
| test_abandon_command.rs | ||
| test_alias.rs | ||
| test_branch_command.rs | ||
| test_cat_command.rs | ||
| test_checkout.rs | ||
| test_chmod_command.rs | ||
| test_commit_command.rs | ||
| test_commit_template.rs | ||
| test_concurrent_operations.rs | ||
| test_config_command.rs | ||
| test_debug_command.rs | ||
| test_describe_command.rs | ||
| test_diff_command.rs | ||
| test_diffedit_command.rs | ||
| test_duplicate_command.rs | ||
| test_edit_command.rs | ||
| test_git_clone.rs | ||
| test_git_colocated.rs | ||
| test_git_fetch.rs | ||
| test_git_import_export.rs | ||
| test_git_push.rs | ||
| test_git_remotes.rs | ||
| test_git_submodule.rs | ||
| test_gitignores.rs | ||
| test_global_opts.rs | ||
| test_init_command.rs | ||
| test_interdiff_command.rs | ||
| test_log_command.rs | ||
| test_move_command.rs | ||
| test_new_command.rs | ||
| test_obslog_command.rs | ||
| test_operations.rs | ||
| test_rebase_command.rs | ||
| test_resolve_command.rs | ||
| test_restore_command.rs | ||
| test_revset_output.rs | ||
| test_show_command.rs | ||
| test_sparse_command.rs | ||
| test_split_command.rs | ||
| test_squash_command.rs | ||
| test_status_command.rs | ||
| test_templater.rs | ||
| test_tree_level_conflicts.rs | ||
| test_undo.rs | ||
| test_unsquash_command.rs | ||
| test_untrack_command.rs | ||
| test_util_command.rs | ||
| test_workspaces.rs | ||