sapling
sapling copied to clipboard
facebook
'sl histedit' stops on every commit even if no conflicts
If I use sl histedit and choose to for instance edit a single commit in a stack, sl will pause on every commit after sl histedit --continue instead of automatically applying all of the subsequent '[p]ick' commits from the histedit command list. I believe that it should only pause if a merge conflict occurs. Additionally, histedit gives no indication that we're still editing history, so an sl status is required to understand the current state.
On further inspection, this may be caused by failed submodule updates between checkouts. Those have been causing all sorts of odd issues in this particular repo.
