Good beginner doc-hacking task: clear-text vs. cleartext vs. clear text vs. plaintext etc..
4 patchsets tracked - current t254588_18
v18t254588_18posted 6 days agosuccesswon't retryrecent 2dpg 20
base2c077c7d6 3 days ago on master
applyapplied 3 days ago
rebaselast tried 2 days ago on afdbe2596
Applying: doc: Standardise cleartext and plain text terms Using index info to reconstruct a base tree... M doc/src/sgml/catalogs.sgml M doc/src/sgml/client-auth.sgml M doc/src/sgml/config.sgml M doc/src/sgml/dblink.sgml M doc/src/sgml/docguide.sgml M doc/src/sgml/func/func-trigger.sgml M doc/src/sgml/glossary.sgml M doc/src/sgml/libpq.sgml M doc/src/sgml/maintenance.sgml M doc/src/sgml/passwordcheck.sgml M doc/src/sgml/pgcrypto.sgml M doc/src/sgml/postgres-fdw.sgml M doc/src/sgml/protocol.sgml M doc/src/sgml/ref/pg_dump.sgml M doc/src/sgml/ref/pg_restore.sgml M doc/src/sgml/ref/psql-ref.sgml Falling back to patching base and 3-way merge... Auto-merging doc/src/sgml/postgres-fdw.sgml CONFLICT (content): Merge conflict in doc/src/sgml/postgres-fdw.sgml Auto-merging doc/src/sgml/dblink.sgml CONFLICT (content): Merge conflict in doc/src/sgml/dblink.sgml Auto-merging doc/src/sgml/config.sgml Patch failed at 0001 doc: Standardise cleartext and plain text terms 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: doc/src/sgml/postgres-fdw.sgml, doc/src/sgml/dblink.sgml
push3 days ago -> d12d3004bbranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 20 | 1068 / 1068 | 2m 47s / 4m 57s | docker run ... :t254588 | 3 days ago |
run 44498723695executed 1068 - ccache 78 hit / 6547 miss - head d12d3004b - digest sha256:5f6b2e3542b315... - run 44498723695 | ||||||
| success | 1 | 20 | 1067 / 1067 | 3m 03s / 5m 37s | docker run ... @sha256:abe8b83... | 4 days ago |
run 44277877476executed 1067 - ccache 78 hit / 6547 miss - head bc63b4781 - digest sha256:abe8b83f7f2b38... - run 44277877476 | ||||||
| success | 1 | 20 | 1067 / 1067 | 2m 23s / 5m 01s | docker run ... @sha256:235c409... | 5 days ago |
run 44055951330executed 1067 - ccache 78 hit / 6547 miss - head dc89122a7 - digest sha256:235c4093bbcd6e... - run 44055951330 | ||||||
| success | 1 | 20 | 1067 / 1067 | 3m 02s / 5m 35s | docker run ... @sha256:8b62f9d... | 6 days ago |
run 43840021535executed 1067 - ccache 78 hit / 6547 miss - head b0cbf3e51 - digest sha256:8b62f9dc4a6e9c... - run 43840021535 | ||||||
v14t254588_14posted Nov 12, 16:37successsupersededrecent 14dpg 20
basebb8a88bbd Nov 06, 20:56 - 14 days / 216 commits behind master (from history)
applyapplied Nov 12, 16:38
rebaselast tried 7 days ago on 81b2179b4
Applying: Doc: standardise cleartext and plain text terms Using index info to reconstruct a base tree... M doc/src/sgml/catalogs.sgml M doc/src/sgml/config.sgml M doc/src/sgml/ref/pg_dump.sgml Falling back to patching base and 3-way merge... Auto-merging doc/src/sgml/ref/pg_dump.sgml CONFLICT (content): Merge conflict in doc/src/sgml/ref/pg_dump.sgml Auto-merging doc/src/sgml/config.sgml Auto-merging doc/src/sgml/catalogs.sgml Patch failed at 0001 Doc: standardise cleartext and plain text terms 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: doc/src/sgml/ref/pg_dump.sgml
pushNov 12, 16:39 -> a3952ad6cbranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 20 | 1053 / 1053 | 2m 46s / 4m 54s | docker run ... @sha256:7e59537... | Nov 12, 16:49 |
run 43260979260executed 1053 - ccache 78 hit / 6546 miss - head a3952ad6c - digest sha256:7e5953735e10b6... - run 43260979260 | ||||||
v13t254588_13posted Nov 12, 16:24successsupersededrecent 14dpg 20
basebb8a88bbd Nov 06, 20:56 - 14 days / 216 commits behind master (from history)
applyapplied Nov 12, 16:26
rebaselast tried Nov 12, 16:26 on 165af118c
Applying: Doc: standardise cleartext and plain text terms Using index info to reconstruct a base tree... M doc/src/sgml/catalogs.sgml M doc/src/sgml/config.sgml M doc/src/sgml/ref/pg_dump.sgml Falling back to patching base and 3-way merge... Auto-merging doc/src/sgml/ref/pg_dump.sgml CONFLICT (content): Merge conflict in doc/src/sgml/ref/pg_dump.sgml Auto-merging doc/src/sgml/config.sgml Auto-merging doc/src/sgml/catalogs.sgml Patch failed at 0001 Doc: standardise cleartext and plain text terms 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: doc/src/sgml/ref/pg_dump.sgml
pushNov 12, 16:26 -> 8f63a71edbranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 20 | 1053 / 1053 | 2m 46s / 5m 03s | docker run ... @sha256:0eceeab... | Nov 12, 16:37 |
run 43258775767executed 1053 - ccache 78 hit / 6546 miss - head 8f63a71ed - digest sha256:0eceeabc640147... - run 43258775767 | ||||||
v5t254588_5posted Nov 10, 16:30successsupersededrecent 14dpg 20
basebb8a88bbd Nov 06, 20:56 - 14 days / 216 commits behind master (from history)
applyapplied Nov 10, 16:31
rebaselast tried Nov 11, 16:32 on a9cb202e9
Applying: Doc: standardise cleartext and plain text terms Using index info to reconstruct a base tree... M doc/src/sgml/catalogs.sgml M doc/src/sgml/config.sgml M doc/src/sgml/ref/pg_dump.sgml Falling back to patching base and 3-way merge... Auto-merging doc/src/sgml/ref/pg_dump.sgml CONFLICT (content): Merge conflict in doc/src/sgml/ref/pg_dump.sgml Auto-merging doc/src/sgml/config.sgml Auto-merging doc/src/sgml/catalogs.sgml Patch failed at 0001 Doc: standardise cleartext and plain text terms 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: doc/src/sgml/ref/pg_dump.sgml
pushNov 10, 16:31 -> d30549b6abranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 20 | 1053 / 1053 | 3m 04s / 5m 27s | docker run ... @sha256:1b54125... | Nov 10, 16:42 |
run 42855427958executed 1053 - ccache 78 hit / 6546 miss - head d30549b6a - digest sha256:1b54125fad4fd3... - run 42855427958 | ||||||