From 637071a84b6dd25df42b8fa79f31bc73d338c55a Mon Sep 17 00:00:00 2001 From: Michael Muré Date: Wed, 11 Jan 2023 13:28:07 +0100 Subject: make go1.19 fmt happy --- entity/dag/entity_actions.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'entity') diff --git a/entity/dag/entity_actions.go b/entity/dag/entity_actions.go index 2a2bf87f..97a68c36 100644 --- a/entity/dag/entity_actions.go +++ b/entity/dag/entity_actions.go @@ -53,18 +53,18 @@ func Pull[EntityT entity.Interface](def Definition, wrapper func(e *Entity) Enti // MergeAll will merge all the available remote Entity: // // Multiple scenario exist: -// 1. if the remote Entity doesn't exist locally, it's created -// --> emit entity.MergeStatusNew -// 2. if the remote and local Entity have the same state, nothing is changed -// --> emit entity.MergeStatusNothing -// 3. if the local Entity has new commits but the remote don't, nothing is changed -// --> emit entity.MergeStatusNothing -// 4. if the remote has new commit, the local bug is updated to match the same history -// (fast-forward update) -// --> emit entity.MergeStatusUpdated -// 5. if both local and remote Entity have new commits (that is, we have a concurrent edition), -// a merge commit with an empty operationPack is created to join both branch and form a DAG. -// --> emit entity.MergeStatusUpdated +// 1. if the remote Entity doesn't exist locally, it's created +// --> emit entity.MergeStatusNew +// 2. if the remote and local Entity have the same state, nothing is changed +// --> emit entity.MergeStatusNothing +// 3. if the local Entity has new commits but the remote don't, nothing is changed +// --> emit entity.MergeStatusNothing +// 4. if the remote has new commit, the local bug is updated to match the same history +// (fast-forward update) +// --> emit entity.MergeStatusUpdated +// 5. if both local and remote Entity have new commits (that is, we have a concurrent edition), +// a merge commit with an empty operationPack is created to join both branch and form a DAG. +// --> emit entity.MergeStatusUpdated // // Note: an author is necessary for the case where a merge commit is created, as this commit will // have an author and may be signed if a signing key is available. -- cgit