From fc73ef8d6e92eec22385cbb641dd0db55030f1ca Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Wed, 10 Mar 2021 14:19:19 -0800 Subject: [PATCH] view: delete an incorrect comment about a race Unlike in `Transaction::commit()`, in the `view` module, we actually don't update the `.jj/view/op_heads/` directory until after we've recorded the index associated with the operation, so there's no race there. --- lib/src/view.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/src/view.rs b/lib/src/view.rs index 37077817c..182707762 100644 --- a/lib/src/view.rs +++ b/lib/src/view.rs @@ -365,7 +365,6 @@ fn merge_op_heads( metadata: operation_metadata, }; let merge_operation_id = op_store.write_operation(&merge_operation).unwrap(); - // TODO: Like in Transaction::commit(), there's a race here. index_store .associate_file_with_operation(merged_index.as_ref(), &merge_operation_id) .unwrap();