)]}'
{
  "commit": "ee7bf7771daddfbc210b02a812c854ead1b77a55",
  "tree": "8b94179e5d53b251d6d1ec1b3cc5c2d09c2ed7ae",
  "parents": [
    "b3ad80678c04e7057748a1e3a53ceb1ff7c1d228",
    "19fc814510c3f661192a5d7c02833f1c95f282cf"
  ],
  "author": {
    "name": "David M. Johnson",
    "email": "snoopdave@apache.org",
    "time": "Sat Sep 05 17:05:57 2026 -0400"
  },
  "committer": {
    "name": "David M. Johnson",
    "email": "snoopdave@apache.org",
    "time": "Sat Sep 05 17:05:57 2026 -0400"
  },
  "message": "Merge branch \u0027master\u0027 into enclosure-metadata-entry\n\nThree conflicts.\n\nApplicationResources_zh_CN.properties: both sides trimmed a different number\nof trailing blank lines. Resolved to master\u0027s ending.\n\nEntryEdit: each side dropped a different set of imports, so the union of the\ntwo conflict sides was misleading. Master removed the outbound trackback code\nand this branch removed the remote-fetch code; the merged body references\nneither, so only the cache import remains. save() keeps the guard that arrived\nfrom master and stays package-private, which this branch had widened it to so\nits test can drive it.\n\nMediaFileAddSuccess.jsp: both sides had independently moved the inline handler\nonto data attributes, master via a delegated listener and this branch via a\ndirect binding. Keeping both would have left two handlers and two definitions\nof setEnclosure, and the later one wins, which would have silently dropped the\ntype and length this branch adds. Resolved to the delegated listener carrying\nall three values.\n\nOne test needed adjusting for the merged code: the new-entry case in\nEntryEditEnclosureTest drives save() directly and never runs myPrepare, so it\nnow stands up the entry myPrepare creates for a new post.\n\nClaude-Session: https://claude.ai/code/session_019R1jdtwkaYEeA6L9DXEtEi\n",
  "tree_diff": []
}