Skip to content
Snippets Groups Projects
Commit e513de55 authored by Georges Racinet's avatar Georges Racinet
Browse files

MercurialOperationsService, with first method MergeAnalysis

This new service will take care of all mutations, in analogy with
Gitaly's `OperationsService`. The first method is actually an exception,
since it does not perform any mutation, but it will make sense to have
it beside `Merge` and `FastForwardMerge`.

Normally, we should not add it in stable branches, but the default branch
is currently tied to upstream protocol updates, hence to the release
schedule of the Rails app, which is not released frequently due to jumps
for upstream catch-up. It will be acceptable if clients use this only
if certain feature flags that are `false` by default are activated.

The `MergeAnalysis` method should provide everything needed by the
Rails app for all merge operations (fast-forward or not). The
conflicts detection is the second use case of working directories
(after `CommitLanguages`), and the first introducing local modifications.
parent f4b5893b
No related branches found
No related tags found
2 merge requests!198Merge stable branch,!197MercurialOperationsService, with first method MergeAnalysis
Pipeline #72051 passed
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment