fix bug in merge (#3270)

treeverse · Apr 28, 2022 · 346391d · 346391d
1 parent 4941971
commit 346391d
Show file tree

Hide file tree

Showing 2 changed files with 331 additions and 241 deletions.
diff --git a/pkg/graveler/committed/manager.go b/pkg/graveler/committed/manager.go
@@ -182,7 +182,7 @@ func (c *committedManager) Diff(ctx context.Context, ns graveler.StorageNamespac
 func (c *committedManager) Merge(ctx context.Context, ns graveler.StorageNamespace, destination, source, base graveler.MetaRangeID, strategy graveler.MergeStrategy) (graveler.MetaRangeID, error) {
 	if source == base {
 		// no changes on source
-		return "", nil
+		return "", graveler.ErrNoChanges
 	}
 	if destination == base {
 		// changes introduced only on source