Concurrent ALTER SEQUENCE RESTART Regression

back to CI dashboard

1 patchset tracked - current t36576_82

v82t36576_82posted Jun 13, 2017successwon't retryancient 9ypg 10
basea475e4663 Jun 12, 2017 - 3386 days / 22544 commits behind master (from history)
applyapplied Aug 18, 16:59
rebaselast tried Aug 18, 16:59 on 195e8e427
Applying: Use RangeVarGetRelidExtended() in AlterSequence()
Using index info to reconstruct a base tree...
M	src/backend/commands/sequence.c
M	src/test/regress/expected/sequence.out
M	src/test/regress/sql/sequence.sql
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/sql/sequence.sql
Auto-merging src/test/regress/expected/sequence.out
Auto-merging src/backend/commands/sequence.c
CONFLICT (content): Merge conflict in src/backend/commands/sequence.c
Patch failed at 0001 Use RangeVarGetRelidExtended() in AlterSequence()

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/backend/commands/sequence.c
pushAug 18, 16:59 -> 5077bed10branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success110451 / 4511m 51s / 5m 52sdocker run ... :t36576Aug 18, 17:12
run 32163213513
executed 451 - ccache 49 hit / 4930 miss - head 5077bed10 - digest sha256:19e957e200f61a... - run 32163213513