Garry Tan and capy-ai[bot]
4b1a115284
ship-receipt carry: changed and moved-context paths compose into one bounded re-check (GST-1561) ( #4054 )
...
* test: failing-first repro for the changed+context carry deadlock (GST-1561)
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* ship-receipt carry: a changed path plus moved base context compose into one bounded re-check, and a base-side removed line joins the scoped review (GST-1561)
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* fix: pre-landing review fixes
baseEditOnly refuses a hunk whose range holds a line the base inserted without replacing any, so a merge that drops base code stays changed. Curates the new test out of the Windows scoped shard like ship-mechanical-retake.
Review-Finding: p1/specialist-batched#1 reader=testing
Review-Finding: p1/red-team#1 reader=red-team
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* fix: pre-landing review fixes
baseEditOnly refuses any base hunk at the reviewed range that adds more lines than it removes, so a merge that drops a line the base added beside its own edit stays changed.
Review-Finding: p2/red-team#1 reader=red-team
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* docs: ship-policy names the base-added-line case that stays a changed path (GST-1561)
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
---------
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
2026-11-06 07:02:54 +00:00
..
2026-11-06 04:33:54 +00:00
2026-11-06 00:38:43 +00:00
2026-11-06 02:08:16 +00:00
2026-10-30 12:03:08 +00:00
2026-11-02 17:44:00 +00:00
2026-10-28 04:33:53 +00:00
2026-11-02 01:35:47 +00:00
2026-11-05 00:01:33 +00:00
2026-11-04 03:23:51 +00:00
2026-10-31 22:41:36 +00:00
2026-11-02 14:49:46 +00:00
2026-11-04 01:31:37 +00:00
2026-11-02 13:07:54 +00:00
2026-11-02 01:35:47 +00:00
2026-11-02 01:35:47 +00:00
2026-11-02 01:35:47 +00:00
2026-11-04 03:03:39 +00:00
2026-11-02 05:13:19 +00:00
2026-11-02 01:35:47 +00:00
2026-11-02 01:35:47 +00:00
2026-11-02 01:35:47 +00:00
2026-11-04 23:59:00 +00:00
2026-11-04 00:31:14 +00:00
2026-11-04 03:42:16 +00:00
2026-11-02 01:35:47 +00:00
2026-11-01 01:25:15 +00:00
2026-11-04 03:42:16 +00:00
2026-11-02 13:07:54 +00:00
2026-10-28 05:45:54 +00:00
2026-11-03 02:18:33 +00:00
2026-11-02 01:35:47 +00:00
2026-10-28 05:45:54 +00:00
2026-11-02 14:49:46 +00:00
2026-11-03 01:49:53 +00:00
2026-10-28 05:45:54 +00:00
2026-11-03 22:35:15 +00:00
2026-11-05 00:50:43 +00:00
2026-10-31 05:53:14 +00:00
2026-11-03 01:40:07 +00:00
2026-11-02 13:07:54 +00:00
2026-11-05 15:57:51 +00:00
2026-11-04 22:19:08 +00:00
2026-11-03 22:58:53 +00:00
2026-10-31 00:42:31 +00:00
2026-11-04 03:23:51 +00:00
2026-11-03 06:49:00 +00:00
2026-10-31 10:23:41 +00:00
2026-11-04 01:22:38 +00:00
2026-11-04 02:59:50 +00:00
2026-11-01 01:25:15 +00:00
2026-11-05 21:27:04 +00:00
2026-10-31 10:08:55 +00:00
2026-10-30 21:28:02 +00:00
2026-10-30 21:28:02 +00:00
2026-10-29 19:01:03 +00:00
2026-11-03 14:14:50 +00:00
2026-11-01 09:19:25 +00:00
2026-11-02 12:58:56 +00:00
2026-11-04 22:19:08 +00:00
2026-11-05 02:33:43 +00:00
2026-11-05 05:42:03 +00:00
2026-10-31 04:53:38 +00:00
2026-11-01 14:23:49 +00:00
2026-11-01 14:23:49 +00:00
2026-11-01 14:23:49 +00:00
2026-11-01 14:23:49 +00:00
2026-10-29 10:29:23 +00:00
2026-11-05 00:29:18 +00:00
2026-11-02 13:07:54 +00:00
2026-11-04 00:18:18 +00:00
2026-11-06 00:38:43 +00:00
2026-11-02 09:57:10 +00:00
2026-11-02 15:08:48 +00:00
2026-11-05 15:57:51 +00:00
2026-11-05 02:33:43 +00:00
2026-11-03 00:58:12 +00:00
2026-11-03 00:30:49 +00:00
2026-11-03 01:40:07 +00:00
2026-11-03 01:40:07 +00:00
2026-11-02 16:10:42 +00:00
2026-11-04 22:19:08 +00:00
2026-10-28 04:17:22 +00:00
2026-10-28 04:17:22 +00:00
2026-11-03 01:07:06 +00:00
2026-11-03 10:52:35 +00:00
2026-11-01 15:32:09 +00:00
2026-11-05 15:57:51 +00:00
2026-11-03 01:49:53 +00:00
2026-11-03 01:49:53 +00:00
2026-11-03 01:49:53 +00:00
2026-11-01 15:32:09 +00:00
2026-11-03 01:49:53 +00:00
2026-11-02 01:35:47 +00:00
2026-11-02 01:35:47 +00:00
2026-11-03 01:40:07 +00:00
2026-11-05 02:30:04 +00:00
2026-10-29 05:50:41 +00:00
2026-11-04 22:19:08 +00:00
2026-10-31 15:49:11 +00:00
2026-11-03 17:08:30 +00:00
2026-10-31 15:49:11 +00:00
2026-11-03 17:08:30 +00:00
2026-10-31 15:20:39 +00:00
2026-11-04 01:42:33 +00:00
2026-11-03 14:14:50 +00:00
2026-11-03 16:39:31 +00:00
2026-11-03 01:40:07 +00:00
2026-11-02 21:28:30 +00:00
2026-10-31 22:41:36 +00:00
2026-11-02 17:44:00 +00:00
2026-11-02 01:50:24 +00:00
2026-11-02 13:07:54 +00:00
2026-11-05 02:33:43 +00:00
2026-10-30 03:14:00 +00:00
2026-11-03 01:40:07 +00:00
2026-11-05 15:57:51 +00:00
2026-10-31 05:53:14 +00:00
2026-11-03 00:39:09 +00:00
2026-11-03 00:39:09 +00:00
2026-11-04 03:01:32 +00:00
2026-10-31 01:09:31 +00:00
2026-10-29 04:22:41 +00:00
2026-11-03 19:49:58 +00:00
2026-11-03 01:40:07 +00:00
2026-11-02 23:05:47 +00:00
2026-11-01 08:12:16 +00:00
2026-11-03 01:40:07 +00:00
2026-11-03 22:58:53 +00:00
2026-10-31 09:54:03 +00:00
2026-10-31 09:54:03 +00:00
2026-11-03 16:45:58 +00:00
2026-11-02 14:49:46 +00:00
2026-11-02 16:20:02 +00:00
2026-11-03 18:53:52 +00:00
2026-11-03 10:52:35 +00:00
2026-11-02 09:57:10 +00:00
2026-11-02 16:20:02 +00:00
2026-11-04 01:25:21 +00:00
2026-11-01 14:23:49 +00:00
2026-11-01 14:23:49 +00:00
2026-11-01 23:20:55 +00:00
2026-11-01 00:29:06 +00:00
2026-11-03 00:39:09 +00:00
2026-10-28 13:05:02 +00:00
2026-11-04 01:32:57 +00:00
2026-11-03 00:39:09 +00:00
2026-11-04 01:26:11 +00:00
2026-11-02 16:20:02 +00:00
2026-10-29 04:37:43 +00:00
2026-11-02 03:23:35 +00:00
2026-11-03 01:40:07 +00:00
2026-11-05 06:06:09 +00:00
2026-11-02 19:48:37 +00:00
2026-11-03 22:35:15 +00:00
2026-11-03 22:35:15 +00:00
2026-11-03 22:35:15 +00:00
2026-11-01 05:57:18 +00:00
2026-11-03 14:30:58 +00:00
2026-10-29 05:35:56 +00:00
2026-11-03 15:21:29 +00:00
2026-11-03 15:41:57 +00:00
2026-11-03 15:04:56 +00:00
2026-11-02 09:26:46 +00:00
2026-11-02 09:46:47 +00:00
2026-11-01 15:47:35 +00:00
2026-11-04 03:33:48 +00:00
2026-11-01 09:35:42 +00:00
2026-11-01 14:23:49 +00:00
2026-11-01 14:23:49 +00:00
2026-11-01 14:23:49 +00:00
2026-11-03 22:58:53 +00:00
2026-11-05 00:53:58 +00:00
2026-10-31 04:53:38 +00:00
2026-11-05 21:27:04 +00:00
2026-11-02 14:49:46 +00:00
2026-11-02 01:07:12 +00:00
2026-11-05 02:30:04 +00:00
2026-11-04 22:19:08 +00:00
2026-11-01 16:01:55 +00:00
2026-11-05 06:06:09 +00:00
2026-10-31 01:09:31 +00:00
2026-11-02 14:49:46 +00:00
2026-10-29 05:50:41 +00:00
2026-11-04 22:19:08 +00:00
2026-11-02 14:49:46 +00:00
2026-11-02 14:49:46 +00:00
2026-10-31 22:41:36 +00:00
2026-11-04 01:31:37 +00:00
2026-11-05 05:16:39 +00:00
2026-11-02 18:05:23 +00:00
2026-11-02 18:05:23 +00:00
2026-11-04 03:03:39 +00:00
2026-11-02 13:07:54 +00:00
2026-11-01 06:11:17 +00:00
2026-10-29 00:16:09 +00:00
2026-11-05 00:04:35 +00:00
2026-10-31 12:28:56 +00:00
2026-11-04 01:32:24 +00:00
2026-11-04 01:32:24 +00:00
2026-11-04 23:50:18 +00:00
2026-11-02 17:44:00 +00:00
2026-11-02 17:44:00 +00:00
2026-10-28 13:05:02 +00:00
2026-11-05 02:30:04 +00:00
2026-11-05 02:30:04 +00:00
2026-11-05 02:30:04 +00:00
2026-11-02 17:44:00 +00:00
2026-11-05 02:30:04 +00:00
2026-11-05 02:30:04 +00:00
2026-11-02 23:05:47 +00:00
2026-11-02 09:16:58 +00:00
2026-11-05 00:01:33 +00:00
2026-11-01 06:11:17 +00:00
2026-11-04 23:59:00 +00:00
2026-10-29 00:16:09 +00:00
2026-11-02 16:20:02 +00:00
2026-11-02 09:37:00 +00:00
2026-11-01 06:11:17 +00:00
2026-11-05 02:30:04 +00:00
2026-11-06 06:15:12 +00:00
2026-10-29 02:20:13 +00:00
2026-11-01 01:50:36 +00:00
2026-11-05 00:43:21 +00:00
2026-11-03 04:02:41 +00:00
2026-11-02 14:59:10 +00:00
2026-10-31 11:29:20 +00:00
2026-11-02 19:23:49 +00:00
2026-11-03 08:34:42 +00:00
2026-11-01 20:30:10 +00:00
2026-11-04 00:18:18 +00:00
2026-10-31 11:29:20 +00:00
2026-10-31 02:58:48 +00:00
2026-11-04 08:02:04 +00:00
2026-11-02 19:23:49 +00:00
2026-11-01 16:28:03 +00:00
2026-11-02 13:07:54 +00:00
2026-11-02 21:04:44 +00:00
2026-10-30 21:28:02 +00:00
2026-10-31 13:36:59 +00:00
2026-10-28 15:15:38 +00:00
2026-11-03 04:12:32 +00:00
2026-11-04 06:31:16 +00:00
2026-11-01 16:28:03 +00:00
2026-11-03 01:59:44 +00:00
2026-11-05 00:01:33 +00:00
2026-11-03 02:18:33 +00:00
2026-11-01 01:25:15 +00:00
2026-11-01 01:25:15 +00:00
2026-11-03 02:56:02 +00:00
2026-11-01 15:32:09 +00:00
2026-10-31 04:53:38 +00:00
2026-10-29 00:01:37 +00:00
2026-11-02 09:16:58 +00:00
2026-11-01 16:01:55 +00:00
2026-11-05 15:57:51 +00:00
2026-11-02 09:57:10 +00:00
2026-11-03 14:21:35 +00:00
2026-11-02 16:20:02 +00:00
2026-11-06 00:38:43 +00:00
2026-11-02 17:44:00 +00:00
2026-11-04 01:39:08 +00:00
2026-10-29 08:53:23 +00:00
2026-11-05 00:01:33 +00:00
2026-10-31 23:55:37 +00:00
2026-11-02 08:23:25 +00:00
2026-11-05 17:57:21 +00:00
2026-11-01 01:50:36 +00:00
2026-11-02 12:16:51 +00:00
2026-11-04 03:15:35 +00:00
2026-11-02 12:58:56 +00:00
2026-11-05 07:33:37 +00:00
2026-11-04 02:58:09 +00:00
2026-11-05 07:33:37 +00:00
2026-11-04 03:38:56 +00:00
2026-11-02 09:16:58 +00:00
2026-11-02 09:16:58 +00:00
2026-11-02 09:16:58 +00:00
2026-11-02 16:32:10 +00:00
2026-10-30 16:54:58 +00:00
2026-11-04 01:28:17 +00:00
2026-10-29 05:35:56 +00:00
2026-11-03 14:06:33 +00:00
2026-11-01 13:28:21 +00:00
2026-11-03 22:44:59 +00:00
2026-11-05 02:30:04 +00:00
2026-11-03 01:40:07 +00:00
2026-11-03 01:40:07 +00:00
2026-11-04 09:55:42 +00:00
2026-11-05 17:40:15 +00:00
2026-11-03 18:22:59 +00:00
2026-11-04 00:11:07 +00:00
2026-11-04 04:35:24 +00:00
2026-10-29 04:55:01 +00:00
2026-10-28 05:45:54 +00:00
2026-11-01 07:28:08 +00:00
2026-11-05 17:40:15 +00:00
2026-11-04 09:55:42 +00:00
2026-11-05 18:06:47 +00:00
2026-11-04 23:46:23 +00:00
2026-11-03 02:56:02 +00:00
2026-11-05 03:37:28 +00:00
2026-11-04 09:55:42 +00:00
2026-11-03 22:35:15 +00:00
2026-11-03 10:39:03 +00:00
2026-11-04 01:23:43 +00:00
2026-10-30 10:40:19 +00:00
2026-11-01 21:26:59 +00:00
2026-11-03 15:04:56 +00:00
2026-11-05 17:12:15 +00:00
2026-11-03 18:22:59 +00:00
2026-11-02 12:16:51 +00:00
2026-11-03 10:46:14 +00:00
2026-11-05 22:23:20 +00:00
2026-11-04 23:53:55 +00:00
2026-11-04 02:57:34 +00:00
2026-11-02 05:53:59 +00:00
2026-11-04 23:53:55 +00:00
2026-11-01 23:05:58 +00:00
2026-11-02 21:53:30 +00:00
2026-11-02 12:06:35 +00:00
2026-11-03 22:35:15 +00:00
2026-11-05 19:27:19 +00:00
2026-11-02 19:33:38 +00:00
2026-11-05 04:13:13 +00:00
2026-11-02 21:53:30 +00:00
2026-11-04 04:35:24 +00:00
2026-11-03 01:40:07 +00:00
2026-11-03 14:14:50 +00:00
2026-11-03 03:24:35 +00:00
2026-11-04 03:28:44 +00:00
2026-11-01 09:35:42 +00:00
2026-10-31 22:41:36 +00:00
2026-11-02 03:46:04 +00:00
2026-11-02 17:44:00 +00:00
2026-11-02 14:39:24 +00:00
2026-11-02 11:36:03 +00:00
2026-11-02 14:39:24 +00:00
2026-10-31 07:22:56 +00:00
2026-11-02 13:07:54 +00:00
2026-11-01 00:29:06 +00:00
2026-11-02 09:16:58 +00:00
2026-11-02 09:16:58 +00:00
2026-11-02 09:16:58 +00:00
2026-11-01 14:23:49 +00:00
2026-11-01 14:23:49 +00:00
2026-11-01 14:23:49 +00:00
2026-11-01 14:23:49 +00:00
2026-11-02 09:16:58 +00:00
2026-11-04 03:01:32 +00:00
2026-11-02 17:44:00 +00:00
2026-10-28 04:33:53 +00:00
2026-11-05 21:27:04 +00:00
2026-11-01 09:35:42 +00:00
2026-11-02 09:16:58 +00:00
2026-11-02 09:57:10 +00:00
2026-11-03 18:34:14 +00:00
2026-11-01 09:35:42 +00:00
2026-11-01 09:35:42 +00:00
2026-11-05 21:27:04 +00:00
2026-11-02 13:07:54 +00:00
2026-11-02 12:58:56 +00:00
2026-11-02 23:05:47 +00:00
2026-11-02 23:05:47 +00:00
2026-11-01 14:23:49 +00:00
2026-11-02 23:05:47 +00:00
2026-10-29 01:58:13 +00:00
2026-11-06 04:33:54 +00:00
2026-10-31 01:09:31 +00:00
2026-10-31 01:09:31 +00:00
2026-10-31 09:07:30 +00:00
2026-10-31 01:09:31 +00:00
2026-11-04 02:59:50 +00:00
2026-10-31 01:09:31 +00:00
2026-10-31 11:01:11 +00:00
2026-10-31 01:09:31 +00:00
2026-10-31 01:09:31 +00:00
2026-10-31 01:09:31 +00:00
2026-10-31 01:09:31 +00:00
2026-11-02 13:07:54 +00:00
2026-11-01 13:42:07 +00:00
2026-11-04 08:14:07 +00:00
2026-11-05 04:16:06 +00:00
2026-11-02 15:08:48 +00:00
2026-11-05 17:12:15 +00:00
2026-11-06 02:08:16 +00:00
2026-11-06 04:33:54 +00:00
2026-11-01 23:05:58 +00:00
2026-11-03 01:40:07 +00:00
2026-11-03 01:40:07 +00:00
2026-10-31 01:09:31 +00:00
2026-10-31 04:53:38 +00:00
2026-11-01 16:01:55 +00:00
2026-11-05 02:30:04 +00:00
2026-11-06 04:33:54 +00:00
2026-11-03 01:40:07 +00:00
2026-11-02 23:15:57 +00:00
2026-11-01 10:32:27 +00:00
2026-11-04 01:32:57 +00:00
2026-11-03 01:40:07 +00:00
2026-11-05 09:21:26 +00:00
2026-11-04 23:35:57 +00:00
2026-11-04 01:28:17 +00:00
2026-11-03 18:44:36 +00:00
2026-11-01 14:23:49 +00:00
2026-11-02 03:23:35 +00:00
2026-10-31 21:46:33 +00:00
2026-11-02 03:23:35 +00:00
2026-10-30 03:14:00 +00:00
2026-11-02 01:50:24 +00:00
2026-11-04 01:28:17 +00:00
2026-11-02 03:23:35 +00:00
2026-11-02 13:07:54 +00:00
2026-11-02 19:48:37 +00:00
2026-11-03 20:09:15 +00:00
2026-11-01 21:26:59 +00:00
2026-11-06 07:02:54 +00:00
2026-11-03 20:09:15 +00:00
2026-10-28 05:45:54 +00:00
2026-10-29 04:37:43 +00:00
2026-11-03 15:13:49 +00:00
2026-11-05 00:19:30 +00:00
2026-11-03 18:22:59 +00:00
2026-11-02 21:17:24 +00:00
2026-11-03 22:35:15 +00:00
2026-11-03 22:35:15 +00:00
2026-11-02 03:46:04 +00:00
2026-11-06 07:02:54 +00:00
2026-11-01 10:13:55 +00:00
2026-11-03 16:45:58 +00:00
2026-11-06 04:33:54 +00:00
2026-11-03 01:40:07 +00:00
2026-11-03 17:08:30 +00:00
2026-11-03 19:49:58 +00:00
2026-11-03 19:49:58 +00:00
2026-11-03 19:39:32 +00:00
2026-10-31 22:41:36 +00:00
2026-11-02 01:35:47 +00:00
2026-11-04 23:59:00 +00:00
2026-11-05 15:57:51 +00:00
2026-11-05 00:22:40 +00:00
2026-10-31 22:41:36 +00:00
2026-10-31 22:41:36 +00:00
2026-10-29 00:16:09 +00:00
2026-11-02 23:05:47 +00:00
2026-10-29 00:16:09 +00:00
2026-11-01 06:11:17 +00:00
2026-10-31 22:41:36 +00:00
2026-10-31 22:41:36 +00:00
2026-10-31 22:41:36 +00:00
2026-10-31 22:41:36 +00:00
2026-10-31 22:41:36 +00:00
2026-10-31 22:41:36 +00:00
2026-10-29 00:16:09 +00:00
2026-11-02 23:05:47 +00:00
2026-11-01 15:32:09 +00:00
2026-10-31 05:17:59 +00:00
2026-10-29 13:42:36 +00:00
2026-11-05 21:27:04 +00:00
2026-11-05 21:27:04 +00:00
2026-11-01 16:01:55 +00:00
2026-11-03 18:53:52 +00:00
2026-11-02 05:02:04 +00:00
2026-10-29 13:28:08 +00:00
2026-11-03 01:40:07 +00:00
2026-11-03 22:51:42 +00:00
2026-11-03 10:52:35 +00:00
2026-11-02 19:00:05 +00:00
2026-11-01 16:01:55 +00:00
2026-11-01 06:11:17 +00:00
2026-11-01 16:01:55 +00:00
2026-11-02 09:16:58 +00:00
2026-11-02 19:11:00 +00:00
2026-11-02 05:24:30 +00:00
2026-11-05 00:43:21 +00:00
2026-11-05 00:43:21 +00:00
2026-11-04 22:19:08 +00:00
2026-10-31 10:08:55 +00:00
2026-11-01 16:01:55 +00:00
2026-11-02 14:49:46 +00:00
2026-11-02 01:22:20 +00:00
2026-11-05 02:30:04 +00:00
2026-11-05 02:30:04 +00:00
2026-11-03 01:40:07 +00:00
2026-11-04 17:07:28 +00:00
2026-11-05 02:30:04 +00:00
2026-11-05 08:42:30 +00:00
2026-11-03 14:06:33 +00:00
2026-11-02 17:44:00 +00:00
2026-11-04 01:40:51 +00:00
2026-11-01 14:23:49 +00:00
2026-11-05 19:24:58 +00:00
2026-11-02 03:11:57 +00:00
2026-11-01 14:23:49 +00:00
2026-11-02 03:11:57 +00:00
2026-11-05 17:56:15 +00:00
2026-11-01 09:35:42 +00:00
2026-10-28 09:59:40 +00:00
2026-11-02 09:16:58 +00:00
2026-10-31 09:54:03 +00:00
2026-10-31 06:07:36 +00:00
2026-10-28 09:59:40 +00:00
2026-11-03 08:43:28 +00:00
2026-11-03 08:43:28 +00:00
2026-11-04 22:19:08 +00:00
2026-11-04 22:19:08 +00:00
2026-11-02 05:02:04 +00:00