docs(operations): document the RD deployment branch and its upstream freeze - #616
Open
mrivas00 wants to merge 4 commits into
Open
docs(operations): document the RD deployment branch and its upstream freeze#616mrivas00 wants to merge 4 commits into
mrivas00 wants to merge 4 commits into
Conversation
mrivas00
force-pushed
the
feat/mati/rd-activity-catalog
branch
from
August 24, 2026 12:25
a7ec780 to
47929a9
Compare
mrivas00
force-pushed
the
docs/mati/rd-branch-freeze
branch
2 times, most recently
from
August 24, 2026 15:10
24da206 to
90dedd8
Compare
mrivas00
force-pushed
the
feat/mati/rd-activity-catalog
branch
2 times, most recently
from
August 24, 2026 17:58
e55a856 to
bf84bb0
Compare
mrivas00
force-pushed
the
docs/mati/rd-branch-freeze
branch
2 times, most recently
from
August 24, 2026 19:11
a46f61a to
7bfcbc8
Compare
mrivas00
force-pushed
the
feat/mati/rd-activity-catalog
branch
from
August 25, 2026 18:50
e9955bc to
b83456b
Compare
mrivas00
force-pushed
the
docs/mati/rd-branch-freeze
branch
from
August 25, 2026 18:50
7bfcbc8 to
3f0cade
Compare
mrivas00
force-pushed
the
feat/mati/rd-activity-catalog
branch
from
August 26, 2026 12:12
b83456b to
9b4acdb
Compare
mrivas00
force-pushed
the
docs/mati/rd-branch-freeze
branch
from
August 26, 2026 12:12
82adb94 to
f65c708
Compare
mrivas00
force-pushed
the
feat/mati/rd-activity-catalog
branch
from
August 26, 2026 12:36
9b4acdb to
eab5475
Compare
mrivas00
force-pushed
the
docs/mati/rd-branch-freeze
branch
from
August 26, 2026 12:36
f65c708 to
719052a
Compare
…freeze The Dominican deployment runs rd/integration, not main, and the branch never merges back. Records what it carries, that only security fixes are cherry-picked (no periodic rebase — upstream seed edits conflict with the Dominican catalogs indefinitely), and that replacing a catalog needs a full database reset that discards captured inventories.
Section 1 is external, PRs 7 and 8 wait on MMARN and the ONE, every database-dependent verification task went unrun for want of a Postgres, the catalog shipped 18 sectors instead of 17, and CI does not trigger for a PR based outside main.
The branch carries the hierarchy of Ley 345-22, not a catalog obtained from the ONE — whose role here is corroborating the counts. Whoever maintains this branch needs to know which source to re-check the catalog against.
The upstream policy said cherry-pick, never rebase. That framing was wrong for this stack: anything landing on `rd/integration` moves the root, and moving the root rebases all ten branches anyway — so a cherry-pick costs a chain rebase plus its own conflicts, not less. Records the 2026-08-26 sync onto `34f66c3b` and the two defects it caught, both of which this branch would otherwise have shipped: industrial-process factors understated a thousandfold for steel and zinc, and `Otro` sorting ahead of `SENI` in the Scope 2 dropdown because both capture endpoints order dimension values alphabetically. Adds the rule the second one teaches: verify a `methodologies.json` merge by diffing factors against main programmatically, not by reading it.
mrivas00
force-pushed
the
feat/mati/rd-activity-catalog
branch
from
August 26, 2026 20:21
eab5475 to
75b74c7
Compare
mrivas00
force-pushed
the
docs/mati/rd-branch-freeze
branch
from
August 26, 2026 20:21
719052a to
c42391b
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why
rd/integrationis a long-lived branch that never merges back into Huella Latam, and nothing in the repository says so. Anyone who finds it — including whoever maintains it after this stack lands — needs to know that a routine rebase ontomainis the wrong move, and why.Docs-only · base
feat/mati/rd-activity-catalog(PR 6).What
docs/operations/rd-deployment-branch.md, linked from the operations index:main— upstream edits totools/seed/src/data/base/*.jsonconflict with the Dominican catalogs indefinitely, so a routine rebase means re-resolving the whole catalog every sync with a real risk of silently reintroducing demo data into a national registry;seed.tsskips whencountry.count() > 0, so replacing a catalog needspnpm db:resetand loses every inventory captured against the previous one. Coordinate the window with MMARN.main.Review notes
This is task 10.3 of the change. Splitting it out of PR 6 keeps that PR's diff to the catalog.
The one thing worth a second opinion is the escalation path for non-security upstream work (item 2 in the policy): cherry-pick deliberately, with an owner, keeping the Dominican side of every conflicting file. If the intended process differs — say, a quarterly review of
maininstead of purely on-demand — that paragraph is the place to correct it.Verification
pnpm formatclean. No code touched.