diff options
| author | Paul Buetow <paul@buetow.org> | 2024-08-12 10:41:11 +0300 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2024-08-12 10:41:11 +0300 |
| commit | b79de37224b40374cd0bc17881b3677138c44935 (patch) | |
| tree | 94db4343ed6ae9dfc35c820f81a0b862d6e8e652 /internal/server/repository | |
| parent | 29705a8e5aad0c5edd4ed720e5c4b5d58a91c6e6 (diff) | |
initially can merge from remote partner but file to disk sync doesn't work yet maybe next time when i work on this this will be sorted.
Diffstat (limited to 'internal/server/repository')
| -rw-r--r-- | internal/server/repository/repository.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/internal/server/repository/repository.go b/internal/server/repository/repository.go index ffe4d37..3a598af 100644 --- a/internal/server/repository/repository.go +++ b/internal/server/repository/repository.go @@ -184,6 +184,7 @@ func (r Repository) Merge(otherEnt types.Entry) error { return r.fs.WriteFile(r.entryPath(ent), bytes) } +// TODO: WHens omething has merged from remotely, make sure to commit/sync to disk func (r Repository) MergeRemotely(ctx context.Context) error { var errs []error @@ -217,6 +218,8 @@ func (r Repository) mergeRemotelyFromPartner(ctx context.Context, partner string continue } + log.Println("pair", pair, "missing in local reposotory, going to merge it") + var ( ent types.Entry uri = fmt.Sprintf("%s/get?id=%s", partner, pair.ID) |