jj/cli/src/merge_tools at 3bf92a091433c33a73853c68b0de7dc8a4f8c967 - mirrors/jj

mirrors/jj

mirror of https://github.com/martinvonz/jj.git synced 2024-10-23 23:10:01 +00:00

History

Martin von Zweigbergk 23509e939e working_copy: get diff from `MergedTree`s To support tree-level conflicts, we're going to need to update the working copy from one `MergedTree` to another. We're going need to store multiple tree ids in the `tree_state` file. This patch gets us closer to that by getting the diff from `MergedTree`s`, even though we assume that they are legacy trees for now, so we can write to the single-tree `tree_state` file.	2023-08-25 06:40:36 -07:00
..
external.rs	working_copy: get diff from `MergedTree`s	2023-08-25 06:40:36 -07:00
mod.rs

Martin von Zweigbergk 23509e939e working_copy: get diff from MergedTrees

To support tree-level conflicts, we're going to need to update the
working copy from one `MergedTree` to another. We're going need to
store multiple tree ids in the `tree_state` file. This patch gets us
closer to that by getting the diff from `MergedTree`s`, even though we
assume that they are legacy trees for now, so we can write to the
single-tree `tree_state` file.

2023-08-25 06:40:36 -07:00

external.rs working_copy: get diff from MergedTrees 2023-08-25 06:40:36 -07:00

mod.rs