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

WIP: fixing filelog recording with copy overwrite

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Pierre-Yves David requested to merge topic/default/test-copies into branch/default Apr 07, 2020
  • Overview 1
  • Commits 32
  • Pipelines 5
  • Changes 38

These changesets introduce test case for situation where a new file overwrite an older one during a merge.

The current implementation (in the first commit) is pretty awful and we would like something cleaner.

The situation is properly detected at merge time, so it is mostly a matters of carrying this information to commit time. To do so, adding a new optional entry in the merge state (at merge time) and reading later (at commit time). Seems like a good option.

Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: topic/default/test-copies