Page MenuHomePhabricator

arc diff should prompt for committing when called again after resolving a merge conflict during arc land
Closed, WontfixPublic

Description

I like a lot that for a simple change that may involve adding and / or editing files, I can just call arc diff and Arcanist will prompt to include or not each change. That allows to skip the git commit step.

However, if arc land fails due to a merge conflict and you call git mergetool, resolve it and call again arc diff, the fixed revision is correctly pushed to Differential, but it will fail again if you try to arc land it.

The solution is to call git commit before calling arc land.

For consistency the simple case described above, and also to avoid an extra step, it would be nice if arc diff could take care of calling git commit (it looks like there's already a commit message ready in there anyway), or at least prompt for it.

Event Timeline

swisspol raised the priority of this task from to Needs Triage.
swisspol updated the task description. (Show Details)
swisspol added subscribers: swisspol, rfergu.
epriestley claimed this task.
epriestley added a subscriber: epriestley.

We haven't seen friction here from other installs in the last few years, and I think (?) this encourages a questionable practice (assuming unreviewed changes in the working copy should be amended) in the general case.