Skip to content

Merge Openwrt 23.05.0-rc3 properly

Andreas Gnau requested to merge merge-openwrt-23.05.0-rc3-properly into devel 
This merge has been done in commit 975b3a2588cd (Upgrade to
OpenWrt-23.05.0-rc3, 2023-10-03), but it had several issues:

1. Not a proper merge commit, thus losing all history and making future
   merges hard.
2. Things from 22.03 had been left inside the branch when merging which
   created errors when running make and feeds update due to errors in
   Makefiles. In this merge we take the 23.05.0-rc3 side and discard
   changes from 22.03.

Do the proper merge commit right before the bad commit had been done. After that merge
commit, the bad commit and a revert of the bad commit are merged
into this branch to re-unite the histories. Doing it this way will make
sure that git blame will attribute lines to the proper OpenWrt commit
instead of the squashed bad commit. Later we can then merge this branch
with the history of latest devel.

Merge request reports