Skip to content
GitLab
  • Menu
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • evolve evolve
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Merge requests 27
    • Merge requests 27
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Activity
  • Graph
  • Jobs
  • Commits
Collapse sidebar
  • mercurial
  • evolveevolve
  • Merge requests
  • !463

next: properly handle cases when user selects an aspiring child

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Anton Shestakov requested to merge topic/stable/next-evolve-aspchild into branch/stable Nov 08, 2022
  • Overview 2
  • Commits 1
  • Pipelines 1
  • Changes 2

When there are ambiguous next changesets and only some of them need to be evolved, and user picks one of them, next used to simply update to it without evolving. Now we check if it's an aspiring child and evolve it before updating to it.

In test-prev-next.t, this case was previously handled by a separate hg evolve --update call. Without this fix, hg next would simply update to the revision 5 ("added d", which is still unstable) without evolving it.

Thanks to Sebastian Unger, who spotted this bug on Evolve Testers mailing list.

Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: topic/stable/next-evolve-aspchild