Allow GiST opcalsses without compress\decompres functions

back to CI dashboard

1 patchset tracked - current t36781_21

v21t36781_21posted Oct 22, 2017tests failedwon't retryancient 9ypg 11
base7d08ce286 Sep 13, 2017 - 3266 days / 21730 commits behind master (from history)
applyapplied 6 days ago
rebaselast tried 6 days ago on 195e8e427
Applying: Create cube opclass without compress\decompress
Using index info to reconstruct a base tree...
M	contrib/cube/Makefile
M	contrib/cube/cube.control
M	contrib/cube/expected/cube.out
M	contrib/cube/sql/cube.sql
Falling back to patching base and 3-way merge...
Auto-merging contrib/cube/sql/cube.sql
CONFLICT (content): Merge conflict in contrib/cube/sql/cube.sql
Auto-merging contrib/cube/expected/cube.out
CONFLICT (content): Merge conflict in contrib/cube/expected/cube.out
Auto-merging contrib/cube/cube.control
CONFLICT (content): Merge conflict in contrib/cube/cube.control
CONFLICT (add/add): Merge conflict in contrib/cube/cube--1.3--1.4.sql
Auto-merging contrib/cube/cube--1.3--1.4.sql
Auto-merging contrib/cube/Makefile
CONFLICT (content): Merge conflict in contrib/cube/Makefile
Patch failed at 0001 Create cube opclass without compress\decompress

/ci/repo/worktrees/worktree/rebase-apply/patch:22: trailing whitespace.
	cube--unpackaged--1.0.sql 
warning: 1 line adds 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: contrib/cube/sql/cube.sql, contrib/cube/expected/cube.out, contrib/cube/cube.control, contrib/cube/cube--1.3--1.4.sql, contrib/cube/Makefile
push6 days ago -> 7297e5e40branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
tests failed111395 / 3961m 48s / 1m 57sdocker run ... :t367816 days ago
run 32162894087
failed: regress/cube
executed 396 - ccache 48 hit / 4934 miss - head 7297e5e40 - digest sha256:7f2e94d9de5b93... - run 32162894087