diff options
| author | Michael Muré <batolettre@gmail.com> | 2021-02-09 15:47:07 +0100 |
|---|---|---|
| committer | Michael Muré <batolettre@gmail.com> | 2021-02-14 12:19:03 +0100 |
| commit | f74166914c344329f08823770982f12966c79a77 (patch) | |
| tree | 56e4ae04f0fd2869d21721b7b875b39a6d78144a /entity/dag/entity_actions.go | |
| parent | f5b92dcd53c744dc12883a35ef2e8e564a8b69de (diff) | |
| download | git-bug-f74166914c344329f08823770982f12966c79a77.tar.gz | |
entity: remove the pack lamport time that doesn't bring anything actually
Diffstat (limited to 'entity/dag/entity_actions.go')
| -rw-r--r-- | entity/dag/entity_actions.go | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/entity/dag/entity_actions.go b/entity/dag/entity_actions.go index fe912557..6f6fe45c 100644 --- a/entity/dag/entity_actions.go +++ b/entity/dag/entity_actions.go @@ -199,17 +199,6 @@ func merge(def Definition, repo repository.ClockedRepo, remoteRef string, author return entity.NewMergeError(err, id) } - // TODO: pack clock - // err = localEntity.packClock.Witness(remoteEntity.packClock.Time()) - // if err != nil { - // return entity.NewMergeError(err, id) - // } - // - // packTime, err := localEntity.packClock.Increment() - // if err != nil { - // return entity.NewMergeError(err, id) - // } - editTime, err := repo.Increment(fmt.Sprintf(editClockPattern, def.namespace)) if err != nil { return entity.NewMergeError(err, id) @@ -220,8 +209,6 @@ func merge(def Definition, repo repository.ClockedRepo, remoteRef string, author Operations: nil, CreateTime: 0, EditTime: editTime, - // TODO: pack clock - // PackTime: packTime, } commitHash, err := opp.Write(def, repo, localCommit, remoteCommit) |