Assert in test_bms_membership();
1 patchset tracked - current t253711_1
v1t253711_1posted Sep 08, 11:52successneeds rebaserecent 10dpg 20
base412ef97d9 Sep 09, 10:58 on master
applyapplied Sep 09, 11:58
rebaselast tried 43 minutes ago on 9e17d25e7
Applying: Validate Bitmapset input in test_bitmapset
Using index info to reconstruct a base tree...
M src/test/modules/test_bitmapset/test_bitmapset.c
Falling back to patching base and 3-way merge...
Auto-merging src/test/modules/test_bitmapset/test_bitmapset.c
CONFLICT (content): Merge conflict in src/test/modules/test_bitmapset/test_bitmapset.c
Patch failed at 0001 Validate Bitmapset input in test_bitmapset
/ci/repo/worktrees/worktree/rebase-apply/patch:18: indent with spaces.
Node *node;
/ci/repo/worktrees/worktree/rebase-apply/patch:20: indent with spaces.
node = stringToNode(text_to_cstring(arg));
/ci/repo/worktrees/worktree/rebase-apply/patch:22: indent with spaces.
if (node != NULL && !IsA(node, Bitmapset))
/ci/repo/worktrees/worktree/rebase-apply/patch:23: indent with spaces.
ereport(ERROR,
/ci/repo/worktrees/worktree/rebase-apply/patch:24: indent with spaces.
(errmsg("input is not a Bitmapset")));
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
conflicts on master: src/test/modules/test_bitmapset/test_bitmapset.c
pushSep 09, 11:58 -> 3e5930537branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 20 | 1020 / 1020 | 2m 12s / 4m 58s | docker run ... :t253711 | Sep 09, 12:10 |
run 34348385923executed 1020 - ccache 98 hit / 6523 miss - head 3e5930537 - digest sha256:2aceb3791d2679... - run 34348385923 | ||||||
| success | 1 | 20 | 1020 / 1020 | 2m 47s / 5m 07s | docker run ... @sha256:e66b13e... | Sep 08, 12:10 |
run 34223459467executed 1020 - ccache 98 hit / 6523 miss - head afb795574 - digest sha256:e66b13ee4f997d... - run 34223459467 | ||||||