mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 10:07:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

view: merge concurrent operations ordered by transaction commit time

Browse source 
This will make it easier to test the result of concurrent operations
(just make sure the operations don't commit during the same
millisecond).
This commit is contained in:
Martin von Zweigbergk 2021-01-10 01:17:59 -08:00
parent c4cd12e93e
commit 3df6a92df6
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/src/view.rs
View file

@ -229,7 +229,7 @@ fn merge_op_heads(
let op_heads =
dag_walk::unreachable(op_heads, &neighbors_fn, &|op: &Operation| op.id().clone());
let mut op_heads: Vec<_> = op_heads.into_iter().collect();
op_heads.sort_by_key(|op| op.id().0.clone());
op_heads.sort_by_key(|op| op.store_operation().metadata.end_time.timestamp.clone());
let first_op_head = op_heads[0].clone();
let mut merged_view = op_store.read_view(first_op_head.view().id()).unwrap();