cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-29 19:11:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

backout: propagate error from merging of trees

Browse Source
This commit is contained in:
Martin von Zweigbergk 2023-08-27 05:49:29 -07:00 committed by Martin von Zweigbergk
parent b19afb6d45
commit e5ec99d159
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/rewrite.rs
View File

@ -108,7 +108,7 @@ pub fn back_out_commit(
) -> Result<Commit, TreeMergeError> {
let old_base_tree = merge_commit_trees(mut_repo, &old_commit.parents())?;
let new_base_tree = merge_commit_trees(mut_repo, new_parents)?;
let new_tree = merge_trees(&new_base_tree, &old_commit.tree(), &old_base_tree).unwrap();
let new_tree = merge_trees(&new_base_tree, &old_commit.tree(), &old_base_tree)?;
let new_parent_ids = new_parents
.iter()
.map(|commit| commit.id().clone())