mirror of
https://github.com/martinvonz/jj.git
synced 2024-10-24 15:43:12 +00:00
33bf6ce1d5
If you rewrite a commit that's also available on some remote, you'll currently see both the old version and the new version in the view, which means they're divergent. They're not logically divergent (the rewritten version should replace the old version), so this is a UX bug. I think it indicates that the set of current heads should be redefined to be the *desired* heads. That's also what I had suspected in the TODO removed by this change. I think another indication that we should hide the old heads even if they have e.g. a remote branch pointing to them is that we don't want them to be rebased if we rewrite an ancestor. So that's what I decided to do: let the view's heads be the desired heads. The user can still define revsets for showing non-current commits pointed to by e.g. remote branches. |
||
|---|---|---|
| .. | ||
| test_bad_locking.rs | ||
| test_commit_builder.rs | ||
| test_commit_concurrent.rs | ||
| test_conflicts.rs | ||
| test_diff_summary.rs | ||
| test_git.rs | ||
| test_index.rs | ||
| test_init.rs | ||
| test_load_repo.rs | ||
| test_merge_trees.rs | ||
| test_mut_repo.rs | ||
| test_operations.rs | ||
| test_refs.rs | ||
| test_revset.rs | ||
| test_revset_graph_iterator.rs | ||
| test_rewrite.rs | ||
| test_view.rs | ||
| test_working_copy.rs | ||
| test_working_copy_concurrent.rs | ||