Skip to content

Commit

Permalink
add logging for conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
gregns1 committed Dec 18, 2024
1 parent 9819b57 commit 16e7bd5
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions db/crud.go
Original file line number Diff line number Diff line change
Expand Up @@ -1256,6 +1256,7 @@ func (db *DatabaseCollectionWithUser) PutExistingCurrentVersion(ctx context.Cont
// conflict check on rev tree history, if there is a rev in rev tree history we have the parent of locally we are not in conflict
parent, currentRevIndex, err = db.revTreeConflictCheck(ctx, revTreeHistory, doc, newDoc.Deleted)
if err != nil {
base.InfofCtx(ctx, base.KeyCRUD, "conflict detected between the two HLV's for doc %s, incoming version %s, local version %s, current rev %s, incoming rev tree history %v", base.UD(doc.ID), newDocHLV.GetCurrentVersionString(), doc.HLV.GetCurrentVersionString(), doc.CurrentRev, revTreeHistory)
return nil, nil, false, nil, err
}
revTreeConflictChecked = true
Expand Down

0 comments on commit 16e7bd5

Please sign in to comment.