ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

cli: fix incompatibility between #271 and #273

Browse source 
The two PRs were incompatible, but it seems they were allowed to
"merge" (rebase) because the merge was conflict free?
This commit is contained in:
Martin von Zweigbergk 2022-05-02 17:27:30 -07:00 committed by Martin von Zweigbergk
parent 305adf05cc
commit 1f2753fd3f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/commands.rs
View file

@ -363,7 +363,7 @@ impl WorkspaceCommandHelper {
self.repo = tx.commit();
locked_working_copy.finish(self.repo.op_id().clone());
} else {
let num_rebased = tx.mut_repo().rebase_descendants(ui.settings());
let num_rebased = tx.mut_repo().rebase_descendants(ui.settings())?;
if num_rebased > 0 {
writeln!(
ui,