46 lines
3.1 KiB
Markdown
46 lines
3.1 KiB
Markdown
> Follow-up: this initial investigation was superseded by a reviewed consolidated migration. Fork dev/work were published, followed by `nigig-makepad-test-android` at `d8d5ea8b6af4b3a96cd435fa1816fd9251d56af1` and `nigig-traffic-camera-boom-fix` at `25e742949dada71af6899ea1c32b25f1e82b3935`. Original histories were exported to `makepad-original-histories.bundle` before the temporary backup branches were deleted. The README names the compatible integration. The historical findings below explain why a naive root rebase was not used.
|
|
|
|
# Makepad synchronization investigation
|
|
|
|
Inspected 2026-10-26. No remote branches were changed or force-pushed.
|
|
|
|
| Ref | Observed commit |
|
|
|---|---|
|
|
| andodeki/makepad `dev` | `4b25a1bf1ed3a1dbb1a7cfea1a030ab8c290fc5a` |
|
|
| andodeki/makepad default `portallist_flow_adaptive_view` | `ecf5a572ab62a1c1598909971f602f99083671cc` |
|
|
| makepad/makepad `dev` (GitHub) | `44ecb822b48106fa76bde4dfd309e5a8a7ff1932` |
|
|
|
|
The GitHub Makepad repository was used as the presumed upstream. Confirm it before publishing a reconciliation branch.
|
|
|
|
`git merge-base dev upstream/dev` returned no common ancestor. The histories have different root commits:
|
|
|
|
- fork: `ff9048cc37985632c96a114a7ad602c41aef2aa1`
|
|
- upstream: `8194041c0fc5218d586c73bb85a1174f1dc19578`
|
|
|
|
`git rev-list --left-right --count dev...upstream/dev` returned `2239 2377`.
|
|
|
|
A trial rebase on a separate `sync/upstream-dev` branch stopped when replaying the fork's Initial commit. It produced widespread add/add conflicts in platform, draw, widgets, tooling and libraries. The trial was aborted and the fork restored unchanged. Blindly accepting ours/theirs or force-pushing would not be a safe synchronization.
|
|
|
|
## Safe next step
|
|
|
|
1. Identify the upstream tree/revision from which the fork's initial snapshot was copied. This is not recorded as ancestry in the supplied repository.
|
|
2. Obtain the Makepad checkout that actually builds budget-app (including wm_theme and storage). Decide which fork features must survive.
|
|
3. Work only on existing branches, as requested; port reviewed fork-only changes in coherent groups. If a reliable base snapshot is found, an explicit `rebase --onto` can instead replay only subsequent fork work; do not guess that boundary.
|
|
4. Resolve and test widgets, script runtime, storage and Android packaging before application-level validation.
|
|
5. Publish reviewed work to the existing branch with authenticated Git access; do not create new branches. A force-with-lease update, if eventually required, needs the expected old SHA and agreement to rewrite shared history.
|
|
|
|
This task has **not** updated the remote fork. The opt-in Android Java packager patch is provided separately in budget-app and has not been committed or pushed to Makepad.
|
|
|
|
## Reproduce inspection
|
|
|
|
```sh
|
|
git clone https://gitdab.com/andodeki/makepad.git ../rustdev/makepad
|
|
cd ../rustdev/makepad
|
|
git remote add upstream https://github.com/makepad/makepad.git
|
|
git fetch origin dev
|
|
git fetch upstream dev
|
|
git merge-base origin/dev upstream/dev
|
|
git rev-list --left-right --count origin/dev...upstream/dev
|
|
```
|
|
|
|
Reference clones are reproducible dependencies, not part of the budget-app source deliverable.
|