Artifact ff9662dfee2cc41f492dbbed354d8321dfeaca2f27a1615fda16754496033e62:
An adversarial review found zit annotate could charge a line to the too-recent CHILD when a parent and child check-in share an identical (or non-monotone) event mtime — the chain was ordered (mtime asc, hash). Fossil orders its annotate walk by pure topology (generation number, descendants.c/diff.c), so a parent is ALWAYS processed before its child. Match that.
New repostate.ancestryLinearized runs Kahn's over the reversed (child->parent) ancestry edges within the file's ancestor set, emitting newest->oldest with a (mtime desc, hash) ready-queue among topologically-INCOMPARABLE nodes, then reverses to the engine's oldest-first order — topology is now the PRIMARY key, mtime/hash only orders incomparable versions. annotateFile consumes it in place of the old sort; the attribute engine (primary-parent pass-through, oldest origin, binary refusal, layout) is unchanged. Amends the RESOLVED annotate-attribution rule. Linear/monotone history is byte-identical (degenerates to mtime-ascending); new tests (same-mtime parent-first, non-monotone, merge primary-parent) fail against the old order. 1678 unit + 376 e2e green. by dmestas on 2026-07-18 16:44:18.
C annotate:\sorder\sthe\sversion\schain\sby\stopology,\snot\smtime\n\nAn\sadversarial\sreview\sfound\szit\sannotate\scould\scharge\sa\sline\sto\sthe\stoo-recent\nCHILD\swhen\sa\sparent\sand\schild\scheck-in\sshare\san\sidentical\s(or\snon-monotone)\nevent\smtime\s—\sthe\schain\swas\sordered\s(mtime\sasc,\shash).\sFossil\sorders\sits\nannotate\swalk\sby\spure\stopology\s(generation\snumber,\sdescendants.c/diff.c),\sso\sa\nparent\sis\sALWAYS\sprocessed\sbefore\sits\schild.\sMatch\sthat.\n\nNew\srepostate.ancestryLinearized\sruns\sKahn's\sover\sthe\sreversed\s(child->parent)\nancestry\sedges\swithin\sthe\sfile's\sancestor\sset,\semitting\snewest->oldest\swith\sa\n(mtime\sdesc,\shash)\sready-queue\samong\stopologically-INCOMPARABLE\snodes,\sthen\nreverses\sto\sthe\sengine's\soldest-first\sorder\s—\stopology\sis\snow\sthe\sPRIMARY\skey,\nmtime/hash\sonly\sorders\sincomparable\sversions.\sannotateFile\sconsumes\sit\sin\splace\nof\sthe\sold\ssort;\sthe\sattribute\sengine\s(primary-parent\spass-through,\soldest\norigin,\sbinary\srefusal,\slayout)\sis\sunchanged.\sAmends\sthe\sRESOLVED\nannotate-attribution\srule.\sLinear/monotone\shistory\sis\sbyte-identical\s(degenerates\nto\smtime-ascending);\snew\stests\s(same-mtime\sparent-first,\snon-monotone,\smerge\nprimary-parent)\sfail\sagainst\sthe\sold\sorder.\s1678\sunit\s+\s376\se2e\sgreen. D 2026-07-18T16:44:18.425 F .fossil-settings/ignore-glob 48212e9febe6d74143ee9ac63664d0385fbd2cb43e9877c4c7d86f1faf726292 F README.md 62e1f936cc2ea0e33d717539bdffd6126a639843069bd6256359f2b15cb06232 F build.zig 362c522e6e7a7d7b54a660663f97e7d8ca5ad53a9eb6b6fe458c3b1d44e2d3fa F build.zig.zon d5d4d8f8c01f55e69078eabf2ee65f7c1756bdbb2f71738ac5de9de99e69aff1 F docs/rfcs/draft-fossil-artifact-format-00.txt a6d542a5effeb41d0ea1e916058ccdc0a5819787f167ef1ebad7814f5680e7ad F docs/rfcs/draft-fossil-delta-format-00.txt d8025d6d75322e33887c3334a4b9cc729960028b3c994ed01e5a474e4b388fd2 F docs/rfcs/draft-fossil-repo-state-00.txt fd413bcb28001a8a07009ca0c769cfe666394ba79dd4f14a6461f2b592049595 F docs/rfcs/draft-fossil-sync-protocol-00.txt aa55791464a54ef4b651df8780ba5c46e95c723c7997d09a5b727fef658f920a F src/annotate.zig 0a6b6728099e63c84681d1e5228ebb45fafb55d65df1720358247fd6e6532c63 F src/artifact.zig c630afd9fbbcfaccd7b823105b4d05db1dc85b6af03080a6d58635ed064672ca F src/artifact_fuzz.zig 8bb359ddfe790818e109a1dd7ac0c1b5cec1a8fdc556f37e73504cdb7f933e17 F src/artifact_test.zig da999476660f7e6e1f50ed9da5c30f1c83d6b358e2cfcd265c6932959c85bdd1 F src/bisect.zig 7bfc45d3e0e339017826941463cc4e9118892d2898fbcd319e6e6ca85c4d3301 F src/checkout.zig ac48e76f22c8065f70d2a827ae00ffb99887af80950a93c1a3451a9a1ad0f403 F src/cli.zig c6baeb3b06666ba4940575c03fa395c108093fa6442a64f6a4e1e61326e795a2 F src/container.zig cef1028531f2763f94248b761c8779a1884e44bb854b8c45617494e3ead40e61 F src/container_test.zig a013652b1ed181161d3ad8fc9d8f052f7c27b61e129662632ceaf8cf189445ec F src/delta.zig e8f3a6297d47549aea146222732ccf514c39688414f0a74ba396ac91066686f3 F src/delta_fuzz.zig 9e0d8dbb8c82ca0ba1a80974c076e74e4f37072b21a10812efd5539875904719 F src/delta_test.zig b18d97e117dce8fbcc05bff6f6954effdb946bab6d36337efbe5ef64d10646a0 F src/dst.zig f013a0330c40eaee7e4305f859a3a442c4d7ce145a30a94e844b079c7c52137e F src/e2e.zig 4956815374cf6bbc1c054a66bbbac6e7281aa1ff921ca6d6409902d29e4d7134 F src/extras.zig b8b36b7d6a3d348eeaf733124e671de1dba0bd4fe3cf2acd35268dfb3cf6acfb F src/fuzz_tests.zig 8d8affa880d8ac472c22d3c7bab6ecdb952a445ea1e41023a7420368cd18efe6 F src/logstore.zig f575884881c0bda80a4e817cf2bafd820f614b97cf640499e22141911785c5f6 F src/logstore_benchmark.zig e245474e1cc4f10617866f718aab3958f13b256c609b3e5fd562f500668388c0 F src/logstore_fuzz.zig a16c5bf2acc3b0e144bc10eecc308ef9070bda9f763028c525b7668eed62de32 F src/logstore_test.zig 14a0813d828fb242c4aa8dca45414ed95468a74197fe9bceb96deb6290e89c43 F src/main.zig bb2daebaf50c37e48c70eb62c15a1eac918de9f8443ab6acb360610cb408c51c F src/managed.zig 81ccc2d6321fe3dff91f653305ae4e73bea0b3fae7db2ab2f0cf168d9518d601 F src/merge3.zig 22c24bbea4b5fa79879c984b8208e6b0b17b4837977ac36b79821648a4f900bd F src/repocache.zig aae232a6b1b86e27c5242c0ee17ce9f2544299d99cf4936d8c2c9000e3166884 F src/repoimage.zig 7d2dc2f3c145e10e2d9ba6997705fd61a0cc0aedde8e171c253163d1279ccdd5 F src/repository.zig 6d41e75aafeddf6d6f0e0b04d280402354f2e8ee046d3027162733947a199176 F src/repository_test.zig 329c0fdfc9a84f96a94afbc5e7df5f7b2ef81651413e728ebf886e143ff5df5c F src/repostate.zig 72b063c9b779b6154940abc31c26644346d8ff9aca1ff8c7b6d0f47672ab90ec F src/repostate_test.zig 0645afa55d528f74e6cd1c84fc49568fff8c9c55956db30d48c4390f7a142599 F src/repoview.zig ec2958e1e8fd955c761d240ab80c3b3f62e3473991713c25ed5a603df984e403 F src/rfc_vectors/artifact_a1_1_sha1_manifest.txt 82d8fc78b3fbf85efe80cb05e79db40c910bf0551e55b728c6f9c2ca7a42ddb6 F src/rfc_vectors/artifact_a1_2_sha3_technote.txt 832e850f83aab2e2a754aa97591109f7f05fb41e4126c7e71c88a59d6d17e55d F src/rfc_vectors/artifact_a3_rcard_manifest.txt 47e412ef211f095e93275fadf527909e581eef42357d8437fc7e299bfc3e62a7 F src/rfc_vectors/sync_a1_round1_reply.txt 638813029b10f81303b88859279afb17095d7c779c993f4267870909acabbeb9 F src/rfc_vectors/sync_a1_round2_file_cards.txt 4fa397741f7521cc4181d5d6b04dc143187f57602384eaa688552115ecda27c2 F src/rfc_vectors/sync_a1_round2_reply.txt af956808190c79b37a384041690c36b78845b471d6c6c01d1cced6e3ee92e6b1 F src/rfc_vectors/sync_a2_reply.txt aa130a127cde210f793c7842960083c765e0ffc7b673374fabc8f0edfe03d763 F src/root.zig 67d70309e37fdb31f2aefa5f24a1f1caa56037ac97a503e78d26dba66e289f4e F src/serve.zig baa76b81f5cc21322e85f3d390b533c828c969f6d10580b5e8aa1f339202d945 F src/sim/faulty_file.zig 8e8a0325d0e987d1dd306588f910af5302e6456561eefae92c73c424fc1a9c94 F src/sim/gen.zig 0e237af570a73bc78e9a717a8ea59867611deb2348287765826ea4ff1942528b F src/sim/net.zig 8fb057012ce0a33f67c928cd696bc2761fea8ba4012b2daa33871b2ba5dfe772 F src/sim/oracle.zig 04b81d9472a0529d9e9d030779304c3d6c930f4db20b800ae3f9cbc5c178969a F src/sim/storage_sweep.zig c41aaffe0805cc5fd50c6a2b8b1d6dbd55b5a07be68cde90105adaaca31c9dc6 F src/sim/sync_gen.zig 238d46942915b5c0e989dfc738b5927b5228468ea123e6f17b6fb593aa5cbf6e F src/sim/sync_sweep.zig 5458a84be08823d2d0fc9464665f1c3f3f26563185dc9ae24cf73259faa5d40e F src/smoke.zig c3d33acd93f11af1a7eaab3e1fe1fc16dfb2d0f39585055cd477e656f86d491c F src/storage.zig 512205eb629d5af8d50ad336f1ef49f53b455abd52ee2f9b56d20893cafad39f F src/storage_benchmark.zig 871f00fef1a34a0b2ee7b9656a217a0cf52949fdd710b642a44dc6bf12d6866e F src/sync.zig b04119b2679887c6705ed4831899ca1911ca20afe0bac865022ac8b7ad879194 F src/sync_benchmark.zig 9a4542401c880750ff6565a2ca9f1d116341d1c5af704ef4a05c2732eeec8849 F src/sync_driver.zig 722ed498ea6b76900661a085d4257e51f6416d43ac1185e8ac15140de265f67e F src/sync_driver_test.zig b50450d2938fc60aa90cd9067fc45141a965b63dc2194f42d5109919e380d7df F src/sync_fuzz.zig 3f419ec3e3c0b4ecf99376e46d111c4fae9826d08f9968e649ffdf84d10f9e61 F src/sync_test.zig b47b05d3defeef61a02c9c9817b66288c48430713737c946734dba151bb17e7e F src/transport.zig 4652b2ab7f43ccd8af5ca6ef7604f8e7cd28353450b1ec90d206b881308f8b5f F src/undo.zig 2e213cbe02118e37b11554620b285deae5dbf5b4d8009ae6dc229b84375b7591 F src/update.zig dbc731b339f2a6b32af95ca0ee6b5a36629d8ef9944b3f7006f4c59d62bfdcfd F src/update_test.zig e80b1902fe29d1e8a6984f82974917ecda9b6460905b0c56b7cbc310ced3b73e F src/warmread_benchmark.zig 9421986d49deff3f720e491fb6d1c7162dc9322f4e67dd14198820c3992dc02a P f0dc5f4e2ae4144d05ea61b751386a58c67ece3c44d80c9821b0284a9345483f R 08c05988d79e2b764f3c412a8cf4e819 U dmestas Z 308176e86dee43e7a505e7be279200c5