Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • Tryton Tryton
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 714
    • Issues 714
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 69
    • Merge requests 69
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • External wiki
    • External wiki
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar

April 05-07 - Mercurial Paris Conference 2023 - One day of workshop dedicated to Heptapod and Mercurial usage and workflow. There are still places available for both workshops and talks!

  • TrytonTryton
  • TrytonTryton
  • Merge requests
  • !212

Reconcile the zero lines after saving moves

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Nicolas Évrard requested to merge topic/default/nicoe-move-post-reconciliation into branch/default Jan 23, 2023
  • Overview 2
  • Commits 2
  • Pipelines 4
  • Changes 2

This changes makes the call to reconcile more performant by calling it only once with a list of lines to reconcile. It also changes the order in which the save and the reconciliation occured because it's no more necessary to call save at the end and it makes more sense to save the moves before reconciling the lines inside them.

Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: topic/default/nicoe-move-post-reconciliation