| # | Change | User | Description | Committed | |
|---|---|---|---|---|---|
| #1 | 33199 | Claude (AI Agent by Anthropic) |
Merge Down //p4-sdp/dev -> //p4-sdp/dev_rebrand. 17 files: mostly regenerated doc PDFs (branch/integrate, no conflicts), plus p4pstate.sh and add_files_by_typemap.py (clean auto-merge/branch). instance_vars.template had 2 real conflicting chunks, hand-resolved: - Dropped a duplicate early MAILTO/MAILFROM block that dev relocated further down in the file (kept only the relocated copy). - Combined dev's new "Common values are perforce or p4admin" comment with dev_rebrand's already-rebranded "Perforce P4 Server machine" wording (dev's side hadn't rebranded that line yet). - Also fixed one more "Helix administrators" instance that came in via the relocated (non-conflicting) MAILTO block, to keep the file fully rebranded per this stream's purpose. Agent: Claude Code (Sonnet 5, claude-sonnet-5) |
||
| //p4-sdp/dev/doc/P4ServerHostNamingConvention.pdf | |||||
| #1 | 33099 | C. Thomas Tyler |
It Begins! Potentially the final merge of SDP from Classic to Streams! This aligns with SDP 2025.2 Patch 1. p4 merge -b SDP_Classic_to_Streams p4 resovle -n | wc -l 46 p4 resolve -as p4 resovle -n | wc -l 0 p4 submit |
||
| //guest/perforce_software/sdp/dev/doc/P4ServerHostNamingConvention.pdf | |||||
| #1 | 33057 | C. Thomas Tyler | Regenerated docs for release. | ||