meta(tasks): create [admin-subtree-import-and-cleanup] in OpeItcLoc03/admin
This commit is contained in:
@@ -58,3 +58,73 @@ Done — пометить 🟢 + переходить к `admin-subtree-import-a
|
|||||||
<!-- created-by: OpeItcLoc03@DESKTOP-NSEF0UK / from: OpeItcLoc03/workshop / 2026-05-21T10:22:50.307Z -->
|
<!-- created-by: OpeItcLoc03@DESKTOP-NSEF0UK / from: OpeItcLoc03/workshop / 2026-05-21T10:22:50.307Z -->
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## 🔵 [admin-subtree-import-and-cleanup] — Шаги 3-7 миграции: импорт 4 split-веток из MoreThenCms в admin (clean prefixes через `git subtree add`, populated prefixes через `git read-tree --prefix` merge), cleanup CMS-следов из mixed splits, STATUS.md merge, index.md regen, push на Gitea.
|
||||||
|
|
||||||
|
Объединено в одну таску потому что: тот же agent, та же session, sequential steps без natural review-point между ними. См. `.wiki/concepts/admin-infra-project.md` §Migration mechanics шаги 3-7.
|
||||||
|
|
||||||
|
**Status:** blocked
|
||||||
|
**Where I stopped:** (not started)
|
||||||
|
**Next action:** **3a. Clean prefixes:**
|
||||||
|
```powershell
|
||||||
|
cd ~/projects/.admin
|
||||||
|
git remote add morecms ~/projects/MoreThenCms
|
||||||
|
git fetch morecms
|
||||||
|
git rm .wiki/entities/.gitkeep .wiki/sources/.gitkeep
|
||||||
|
git commit -m "prep: clear gitkeep before subtree import"
|
||||||
|
git subtree add --prefix=.wiki/entities morecms/split-wiki-entities
|
||||||
|
git subtree add --prefix=.wiki/sources morecms/split-wiki-sources
|
||||||
|
```
|
||||||
|
|
||||||
|
**3b. Mixed prefixes (`.wiki/concepts/` and `.tasks/` already have content):**
|
||||||
|
|
||||||
|
Preferred — `git read-tree` merge:
|
||||||
|
```powershell
|
||||||
|
git rm .wiki/concepts/.gitkeep
|
||||||
|
git commit -m "prep: clear concepts gitkeep before import"
|
||||||
|
git fetch morecms split-wiki-concepts
|
||||||
|
git read-tree --prefix=.wiki/concepts/ -u morecms/split-wiki-concepts
|
||||||
|
git commit -m "import: .wiki/concepts/ from MoreThenCms via subtree-split (history preserved via read-tree)"
|
||||||
|
|
||||||
|
git fetch morecms split-tasks
|
||||||
|
git read-tree --prefix=.tasks-imported/ -u morecms/split-tasks
|
||||||
|
git commit -m "import: .tasks/ from MoreThenCms via subtree-split (staged at .tasks-imported/)"
|
||||||
|
# Затем merge content with admin's existing STATUS.md (см. шаг 5).
|
||||||
|
```
|
||||||
|
|
||||||
|
Альтернатива при конфликтах — temp-prefix dance (`.tmp-concepts/`, `git mv`, `git rm -r .tmp-concepts`).
|
||||||
|
|
||||||
|
**4. Cleanup CMS-следов:**
|
||||||
|
```powershell
|
||||||
|
git rm .wiki/concepts/cms-admin-assets-root-folder-seed.md `
|
||||||
|
.wiki/concepts/cms-config-rewrite-pattern.md `
|
||||||
|
.wiki/concepts/cms-maljarka-https-mode-crash.md `
|
||||||
|
.wiki/concepts/cms-server-port-leak-fix.md `
|
||||||
|
.wiki/concepts/webconfig-password-xml-escape.md `
|
||||||
|
.tasks-imported/cms-admin-assets-root-folders-seed.md `
|
||||||
|
.tasks-imported/cms-admin-assets-root-folders-seed.inserted-rows.txt `
|
||||||
|
.tasks-imported/cms-maljarka-https-mode-bug-fix.md `
|
||||||
|
.tasks-imported/cms-port-leak-fix.md `
|
||||||
|
.tasks-imported/traefik-maljarka-502-bug.md
|
||||||
|
git commit -m "cleanup: drop CMS files imported via subtree (they stay in MoreThenCms)"
|
||||||
|
```
|
||||||
|
|
||||||
|
**5. STATUS.md merge:** скопировать non-CMS таски из `.tasks-imported/STATUS.md` в admin/.tasks/STATUS.md (сохраняя 🟢 done статусы); удалить `.tasks-imported/`; rename per-task files в `.tasks/`. Commit `tasks: merge imported MoreThenCms task history with admin live agenda`.
|
||||||
|
|
||||||
|
**6. index.md regen:** обновить `.wiki/index.md` чтобы catalog отражал импортированные entities/concepts/sources. Commit `wiki(index): refresh catalog after subtree import`.
|
||||||
|
|
||||||
|
**7. Push:** `git push origin master`.
|
||||||
|
|
||||||
|
Acceptance:
|
||||||
|
- `git log --follow .wiki/concepts/wd40efax-smr-cascade.md` показывает MoreThenCms-era коммиты (history preserved)
|
||||||
|
- `ls .wiki/entities/` содержит все 6 файлов
|
||||||
|
- `ls .wiki/concepts/` содержит 18 admin-domain + admin-infra-project (новый)
|
||||||
|
- `cat .tasks/STATUS.md` содержит и live agenda (pointers + impl + secrets + roadmap), и imported 🟢 done items
|
||||||
|
- Gitea web shows updated tree
|
||||||
|
|
||||||
|
Done — 🟢; unblock `morecms-cleanup-and-breadcrumb` + `resilience-roadmap-design`.
|
||||||
|
**Blocker:** admin-infra-project-pointers, morecms-subtree-split
|
||||||
|
**Branch:** n/a
|
||||||
|
<!-- created-by: OpeItcLoc03@DESKTOP-NSEF0UK / from: OpeItcLoc03/workshop / 2026-05-21T10:23:14.254Z -->
|
||||||
|
|
||||||
|
---
|
||||||
|
|||||||
Reference in New Issue
Block a user