Compare commits

...
Author SHA1 Message Date
torsten d76515c9a4 Points submod head to latest changes 2026-11-18 18:39:35 +00:00
torsten 007d298c6b Adds merge prompt and result from claude agent 2026-11-18 17:18:06 +00:00
torsten fa96f54ef1 Adds latest rpmbuild submod head 2026-11-18 15:14:33 +00:00
3 changed files with 123 additions and 2 deletions

No files matched your search

@@ -0,0 +1,121 @@
# Agent Prompt: Merge ArcGIS 300 Symbology Regression and XmlPatterns Reimplementation
This prompt defines a later implementation task. While creating or reviewing this prompt, do not check out branches, merge code, run builds, or execute any other prompt. Only when this prompt is explicitly invoked as a separate task should the merge work below be performed.
## Goal
Merge both feature branches into the target branch in the Qt6 migrated repository:
- Target: `action/merge-regress-arcgis-symbolo-with-reimplement-xmlpattern`
- First source: `feature/regression-arcgis300-symbology-migration`
- Second source: `feature/Re-implement-XmlPatterns`
The required checkout is:
`./qt-migration-legatus/qt6-after/qt6-migrated-legatus`
The goal is to retain the ArcGIS 300 symbology regression fixes and the Qt6 XmlPatterns reimplementation together, resolve any integration conflicts with evidence from the code and tests, and validate the resulting target branch. This is a branch integration task, not authorization for unrelated migration, refactoring, cleanup, or release work.
## Branch-relationship context supplied with this task
The requester supplied the following `git log --left-right --decorate --graph --cherry-pick --oneline` comparison between `feature/regression-arcgis300-symbology-migration` and `origin/feature/Re-implement-XmlPatterns`:
- The ArcGIS regression branch contains the listed October/November 2026 Qt6 migration and ArcGIS-related commits, including merge commit `3930a2fbf`.
- The XmlPatterns branch contains commits `d327c66c4`, `8e9594d25`, `3924b1e72`, `fb3e91ea4`, `e067c21b0`, and `131a6714c`.
- The XmlPatterns branch includes the reimplementation of MSDL/SAAB import without Qt XmlPatterns using Qt6 `QDomDocument`, plus related Qt6, build, and dependency changes.
Treat this as user-provided historical context, not proof of the current checkout's refs or contents. Verify the actual branch tips, merge bases, ancestry, and relevant changes in the target repository before merging. Do not substitute similarly named branches or silently omit either source branch.
## Strict repository and branch boundaries
- Perform branch and merge operations only inside `./qt-migration-legatus/qt6-after/qt6-migrated-legatus`.
- The target branch name is exact, including the spelling `symbolo` and singular `xmlpattern`.
- Inspect the outer repository and submodule/worktree status to identify repository boundaries, but do not modify the outer repository's branch or unrelated files.
- Do not check out or modify the Qt5 legacy tree.
- Before any branch switch or merge, record the nested repository's current branch, status, local changes, submodule state, available local and remote refs, and the target/source commit IDs.
- Preserve all pre-existing changes. If the nested repository has uncommitted changes, an in-progress merge/rebase, or a conflict with this task, do not overwrite or discard them; stop and report the blocker.
- Do not create the target branch from an assumed base. If it is absent, determine whether there is an unambiguous intended base from the actual repository refs and supplied history. If the base is not clear, stop before creating it.
- If either source branch or its unambiguous remote-tracking equivalent is unavailable, do not substitute another branch. Report the exact missing ref.
- Merge the ArcGIS regression branch first, then merge `feature/Re-implement-XmlPatterns` into the target. Use actual merge commits; do not squash, rebase, cherry-pick, reset, or force-update branch history.
- Do not push branches or create a pull request unless separately requested.
## Pre-merge investigation
Before merging:
1. Inspect the complete `new_docker_build.sh` at the validation path below and its actual `--help`/argument handling. Record real options, defaults, supported groups, ArcGIS settings, test behavior, and failure propagation. Do not assume options exist based on older prompts or this prompt.
2. Compare the target and both source tips, including merge bases, commit graphs, changed files, and overlapping edits. Use the supplied history only as context.
3. Identify the ArcGIS 300 Symbology behavior and related regression tests, as well as the XmlPatterns-related changes and their Qt6 replacements/tests.
4. Check for interactions in CMake, imports, generated sources, Qt6 APIs, build options, tests, and external dependencies. Confirm the XmlPatterns path does not reintroduce a removed Qt5 XmlPatterns dependency.
5. Record a concise pre-merge plan, including expected conflicts or shared files and the validation that the real script supports.
Do not begin merging if the target base, source refs, or working-tree safety cannot be established.
## Merge and conflict resolution
- Merge only the two named source branches into the named target, in the order above.
- Resolve conflicts minimally, preserving both branches' intended behavior where compatible.
- Do not resolve a conflict by dropping ArcGIS behavior, reverting the Qt6 XmlPatterns reimplementation, disabling a target or test, or introducing a dummy implementation.
- Do not invent a compatibility shim or restore Qt5 XmlPatterns. If the code establishes a necessary replacement, follow the existing Qt6 implementation and project conventions.
- For generated files, follow the project's real generator flow; do not commit generated build artifacts or use stale/source-tree generated outputs as substitutes.
- If a conflict cannot be resolved confidently from repository evidence, stop with the merge state and exact conflict paths documented. Do not manufacture a resolution.
- After the merges, inspect the merge commits, resulting diff, target branch status, and both source branch tips to verify that both were incorporated.
## Scope and preservation
Only make changes necessary to integrate and validate these two branches. Preserve existing Qt6 migration work, ArcGIS 300 support, XmlPatterns replacements, and tests. Do not:
- modify unrelated modules, branches, or repositories;
- perform broad cleanup or refactoring;
- disable or weaken tests/build targets to obtain a passing result;
- suppress warnings instead of fixing an in-scope root cause;
- add generated files, stubs, placeholders, or hand-written generator substitutes;
- change the validation script unless a directly relevant defect prevents required validation, and then make only the minimal fix.
Keep proprietary ArcGIS/RTI SDK files, license files, credentials, and other restricted material out of commits, logs, and reports.
## Required validation
All build and test verification for this task must use this script:
`./qt-migration-legatus/qt6-after/qt6-migrated-legatus/new_docker_build.sh`
Use the script's Docker-backed execution path. Do not run host-side CMake, compiler, Make/Ninja, CTest, or application tests. Do not use another build script as a substitute.
1. Verify the script's actual options and prerequisites before invoking it. Use only supported options and the minimum relevant build/test groups needed to exercise the merged changes.
2. Validate the ArcGIS 300 Symbology configuration using the script's real ArcGIS option(s), if supported.
3. Validate the MSDL/SAAB XmlPatterns replacement and relevant Qt6 build/test targets using options the script actually supports.
4. Confirm failure statuses propagate from configure, build, and test steps. Record the exact command, exit code, and log location for each run.
5. If the script cannot validate one of the required behaviors, do not silently substitute an unapproved host build or claim validation. Report the precise limitation and affected scope.
Do not alter Docker, dependency, or CI configuration except where a minimal, directly relevant integration fix is required. Any such change must be justified and validated through the same authoritative script where possible.
## Completion criteria
Report the work as fully validated only if:
- the target branch contains merge commits incorporating both named source branches;
- the ArcGIS 300 Symbology regression behavior and relevant tests remain present and pass;
- the XmlPatterns-related replacement is integrated and the relevant Qt6 build/tests pass;
- no Qt5 XmlPatterns dependency was reintroduced into the active Qt6 build;
- validation used the authoritative Docker-backed `new_docker_build.sh` path and the actual supported options;
- no unrelated work, generated artifacts, proprietary files, or secrets were added.
If any criterion is unverified, use `PARTIALLY VALIDATED` or `BLOCKED` and identify exactly what could not be established.
## Final report
Provide a concise, factual report with:
- status: `VALIDATED`, `PARTIALLY VALIDATED`, or `BLOCKED`;
- nested repository path, target branch, and resulting target commit;
- source branch refs and commit IDs incorporated;
- merge commits and conflict resolutions, if any;
- changed files and any directly necessary deviations from scope;
- the actual `new_docker_build.sh` options used;
- exact Docker-backed build/test commands, exit codes, and log paths;
- separate results for ArcGIS 300 Symbology and the XmlPatterns replacement;
- skipped checks, exact blockers, and remaining unvalidated behavior.
Do not claim a merge, build, test, or regression fix was successful without evidence from the resulting target branch and validation output.
Submodule rpmbuild updated: f6f395d05c...1a7942d13d.