Page MenuHomePhabricator

split: abort if there's an unfinished operation
Needs ReviewPublic

Authored by martinvonz on Jul 30 2018, 5:45 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Jul 30 2018, 5:45 PM
quark added a subscriber: quark.Jul 31 2018, 1:16 AM

FB has users reporting they need to split commits in the middle of a histedit. So this might be too restrictive.

In D3986#61989, @quark wrote:

FB has users reporting they need to split commits in the middle of a histedit. So this might be too restrictive.

Two thoughts:

  1. We had talked at Google about having the "edit" action create split markers if the user created multiple commits. Do you think that would address the FB users' use case?
  1. It seems very dangerous to not have this check at least when not using obsmarkers and there are descendants of the current commit (split then rebases the descendants), so I'd like to keep the check in at least that case.

Oh, I should have said that I agree with not queuing this patch now. We can discuss what we want to do and do it on the default branch later.

quark added a comment.Aug 1 2018, 11:35 AM

I think a most flexible solution is to not do the check if there is nothing to rebase.