diff options
| author | Michael Muré <batolettre@gmail.com> | 2023-01-11 13:28:07 +0100 |
|---|---|---|
| committer | Michael Muré <batolettre@gmail.com> | 2023-01-11 13:28:07 +0100 |
| commit | 637071a84b6dd25df42b8fa79f31bc73d338c55a (patch) | |
| tree | c843bf0f26bc9b3d8483895ee0d6d0fc7f568470 /entity | |
| parent | 70b0c5b81c106e14c7ee837832ea640bd7c687f5 (diff) | |
| download | git-bug-637071a84b6dd25df42b8fa79f31bc73d338c55a.tar.gz | |
make go1.19 fmt happy
Diffstat (limited to 'entity')
| -rw-r--r-- | entity/dag/entity_actions.go | 24 |
1 files changed, 12 insertions, 12 deletions
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. |