Recovery conflict resolution misses backends that import snapshots
3 patchsets tracked - current t253191_5
v5t253191_5posted Sep 11, 02:51successappliesrecent 0dpg 20
basee73841ffb 1 day ago on master
applyapplied about 14 hours ago
rebaselast tried about 14 hours ago on e73841ffb
pushabout 14 hours ago -> 9a75b922abranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 20 | 1037 / 1037 | 1m 48s / 4m 14s | docker run ... :t253191 | about 14 hours ago |
run 35486731303executed 1037 - ccache 98 hit / 6524 miss - head 9a75b922a - digest sha256:983f741feab5ab... - run 35486731303 | ||||||
| success | 1 | 20 | 1037 / 1037 | 2m 53s / 5m 25s | docker run ... @sha256:126131a... | 1 day ago |
run 35418620871executed 1037 - ccache 98 hit / 6524 miss - head b70300aca - digest sha256:126131aaca2539... - run 35418620871 | ||||||
| success | 1 | 20 | 1037 / 1037 | 2m 54s / 5m 32s | docker run ... @sha256:3ee8e25... | 3 days ago |
run 35303201436executed 1037 - ccache 98 hit / 6524 miss - head c60ab0944 - digest sha256:3ee8e250f0e2d5... - run 35303201436 | ||||||
| success | 1 | 20 | 1037 / 1037 | 2m 53s / 5m 30s | docker run ... @sha256:88941e6... | 4 days ago |
run 35178092871executed 1037 - ccache 98 hit / 6524 miss - head 57c3e2bbb - digest sha256:88941e68409376... - run 35178092871 | ||||||
| success | 1 | 20 | 1037 / 1037 | 2m 14s / 4m 18s | docker run ... @sha256:d69d58b... | 5 days ago |
run 35051589845executed 1037 - ccache 98 hit / 6524 miss - head 76ec5ae0b - digest sha256:d69d58b2bf4e61... - run 35051589845 | ||||||
| success | 1 | 20 | 1037 / 1037 | 2m 51s / 5m 18s | docker run ... @sha256:74d5265... | 6 days ago |
run 34924644355executed 1037 - ccache 98 hit / 6523 miss - head 4a3df655a - digest sha256:74d52658ed9912... - run 34924644355 | ||||||
| success | 1 | 20 | 1024 / 1024 | 2m 44s / 4m 18s | docker run ... @sha256:2a57d50... | 7 days ago |
run 34802167247executed 1024 - ccache 98 hit / 6523 miss - head 8815ee44c - digest sha256:2a57d504c07f93... - run 34802167247 | ||||||
| success | 1 | 20 | 1024 / 1024 | 2m 57s / 5m 46s | docker run ... @sha256:aaa82c6... | Sep 13, 03:16 |
run 34734565169executed 1024 - ccache 98 hit / 6523 miss - head 0e8762766 - digest sha256:aaa82c6815501d... - run 34734565169 | ||||||
| success | 1 | 20 | 1024 / 1024 | 2m 56s / 5m 39s | docker run ... @sha256:c0d63bc... | Sep 12, 03:08 |
run 34669060646executed 1024 - ccache 98 hit / 6523 miss - head 917bbc1a8 - digest sha256:c0d63bc910d469... - run 34669060646 | ||||||
| success | 1 | 20 | 1023 / 1023 | 2m 52s / 5m 34s | docker run ... @sha256:20078d0... | Sep 11, 03:05 |
run 34556369997executed 1023 - ccache 98 hit / 6523 miss - head dd946b158 - digest sha256:20078d08543b78... - run 34556369997 | ||||||
v4t253191_4posted Aug 01, 22:22successsupersededstale 6mopg 19
base0d3dba38c Apr 07, 10:31 - 165 days / 1461 commits behind master (from history)
applyapplied Aug 01, 22:25
rebaselast tried Aug 01, 22:25 on 7a0299a13
Applying: Add TAP test for recovery conflicts from imported snapshots Using index info to reconstruct a base tree... M src/test/recovery/meson.build Falling back to patching base and 3-way merge... Auto-merging src/test/recovery/meson.build CONFLICT (content): Merge conflict in src/test/recovery/meson.build Patch failed at 0001 Add TAP test for recovery conflicts from imported snapshots 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/recovery/meson.build
pushAug 01, 22:25 -> e2ab29e12branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 19 | 997 / 997 | 2m 14s / 5m 02s | docker run ... @sha256:5a59649... | Aug 01, 22:35 |
run 30721221455executed 997 - ccache 89 hit / 6527 miss - head e2ab29e12 - digest sha256:5a59649e3a45bf... - run 30721221455 | ||||||
v1t253191_1posted Jul 25, 23:03successsupersededstale 6mopg 19
base0d3dba38c Apr 07, 10:31 - 165 days / 1461 commits behind master (from history)
applyapplied Jul 28, 21:43
rebaselast tried Jul 28, 21:43 on 239eabda4
Applying: Add TAP test for recovery conflicts from imported snapshots Using index info to reconstruct a base tree... M src/test/recovery/meson.build Falling back to patching base and 3-way merge... Auto-merging src/test/recovery/meson.build CONFLICT (content): Merge conflict in src/test/recovery/meson.build Patch failed at 0001 Add TAP test for recovery conflicts from imported snapshots 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/recovery/meson.build
pushJul 28, 21:43 -> a57fcddf5branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 19 | 997 / 997 | 2m 29s / 4m 53s | docker run ... @sha256:baca717... | Jul 28, 22:04 |
run 30401819398executed 997 - ccache 89 hit / 6527 miss - head a57fcddf5 - digest sha256:baca717de3c191... - run 30401819398 | ||||||