You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit 4b63cb5
Browse filesBrowse the repository at this point in the historyBrowse files
{"area": "cmd/mxcli", "date": "2026-11-06", "symptom": "`mxcli git merge` on ManualResolutionRequired printed no property-level report at all when either side's mx diff failed (exit 129 on a constant whose ExportLevel was \"\" on one side and Hidden on the other), so a reader could not tell 'no details' from 'the diff crashed'", "cause": "The call site only called propertyReport when both diffs returned nil, with no else; propertyReport already rendered a missing file as '(diff unavailable: …)', but never saw the run's error", "file": "cmd/mxcli/cmd_git_merge.go (exit-2 branch, propertyReport)", "fix": "propertyReport takes each side's diff error (diffSide) and is always called: a failed side prints '(diff unavailable: <error on one line>)', the other side its changes", "insight": "A guard that skips output on any error turns one side's failure into silence about both; let the renderer own each side's failure. The mx diff crash itself reproduces on 11.14.0 (\"\" vs Hidden ExportLevel: exit 129), see ako/mxcli#1980", "refs": "ako/mxcli#1981, mendixlabs/mxcli#1750", "test": "cmd/mxcli/gitmerge_test.go (TestGitMerge_FailedDiffIsReportedNotSkipped)"}
Copy file name to clipboardExpand all lines: CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
16
16
### Fixed
17
17
18
18
- **`create constant` writes `ExportLevel: Hidden`, as Studio Pro does** (ako/mxcli#1980, mendixlabs/mxcli#1749) — it wrote `""`, which `mx check` accepts but `mx diff` crashes on against a `Hidden` copy (exit 129), taking `git merge`'s report with it. `create or modify constant` now keeps a stored level instead of clearing it, and repairs a stored `""`.
19
+
- **`git merge` reports the side whose `mx diff` failed instead of dropping the report** (ako/mxcli#1981, mendixlabs/mxcli#1750) — when one side's diff failed, no property-level report was printed at all. The side that worked is shown, and the failing side reads `(diff unavailable: <why>)`.
19
20
- **`widget sync` keeps the integers it does not change as integers** (ako/mxcli#1976, mendixlabs/mxcli#1748) — syncing a widget wrote every int32 and int64 in it back as a double, a text box in the widget's slot included, whose `MaxLengthCode -1.0` Mendix reads as unlimited (CE6510). A unit already synced by an earlier version keeps its doubles; re-create the page to repair it.
20
21
- **A Marketplace Calendar written by mxcli passes a plain `mx check`** (mendixlabs/mxcli#1632) — every Calendar failed with CE0463 "The definition of this widget has changed" until `mxcli fix widgets` or Studio Pro's "Update all widgets"; `mxcli docker check` hid it, since it runs that update on a temporary copy first. The Calendar's `toolbarItems` object list declares its sub-properties directly under `<properties>`, not inside a `<propertyGroup>`, and the `.mpk` parser behind generated widget templates read only the grouped shape, so the list was stored with no definition of its items. Both shapes are now read, a direct sub-property takes its category from its own `<category>` element, and the stored Calendar equals what `mx update-widgets` writes. The other object-list widgets in `doctype-tests/32-pluggable-widget-object-lists-v010.mdl` (Accordion, PopupMenu, Maps, area and line chart, heat map) are stored unchanged.
21
22
- **`alter workflow` no longer guesses which outcome to drop** (ako/mxcli#808) — `drop X outcome 'V'` with two outcomes of value `V` dropped the first; it is refused as ambiguous now. `check --references` also resolves an activity reference by name before caption, as `exec` does, so its guards no longer go silent on a target captioned like another activity's name.
fixture:=`{"unitDifferences":[{"id":"`+tDM+`","type":"DomainModels$DomainModel","change":"Modified","changeDetails":[{"change":"Modified","changeDescription":"Attribute 'MyFirstModule.CreatedByMxcli.Nickname'","changeDetails":[{"property":"New type > Length","baseValue":"100","mineValue":"150"}]}]}]}`
0 commit comments