Skip to content
Snippets Groups Projects

pick: don't create any successors when there were no changes (issue6093)

Merged Raphaël Gomès requested to merge topic/stable/pick-no-changes into branch/stable

For example, when a changeset that user is trying to pick was already grafted or rebased (and no obsmarkers were created), pick will naturally say that there's no changes to commit and will not create the new commit. In that case it should not mark any changeset as a successor of the picked changeset, because the actual file changes were already there before picking.

Technically, pick could (and did before this patch) mark the wdir commit as a successor of picked changeset (may be useful in the most trivial cases when e.g. wdir is a graft of the required change), but there are cases when the picked change is introduced in an ancestor of wdir, or even in multiple ancestors piece by piece. Pick definitely shouldn't be trying to guess something this complicated, so with this patch it always marks the picked change as pruned if it gave no changes to commit.

--HG-- branch : stable

Edited by Raphaël Gomès

Merge request reports

Checking pipeline status.

Merged by Raphaël GomèsRaphaël Gomès 5 years ago (Oct 8, 2019 1:59am UTC)

Loading

Pipeline #35406 passed

Pipeline passed for a9929dd3 on branch/stable

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
Please register or sign in to reply
Loading