A Git based version of Magic Lantern, for those unwilling or unable to work using Mercurial. The vast majority of branches have been removed, with those thought to be important brought in individually and merged.
GNU General Public License v2.0
149
stars
51
forks
source link
Do we want "recovery" branch / portable rom dumper? #84
As far as I can tell, the way this is managed in source control is unusual and difficult to maintain: a separate branch, "recovery" is used, with radical changes to core source files and make profiles. No attempt seems to have been made to plan for integrating this with other branches at a future date.
See e.g. src/disp_direct.c which very clearly shows this if you diff between recovery and unified (or lua_fix), via "hg diff src/disp_direct.c -r recovery:lua_fix". If you try and diff the whole branch... well, enjoy yourself, it's a 57k line diff. Because each branch will have had multiple other, different, branches merged into them at various points over the 10+ years these branches have been separate.
Do we want the functionality of portable rom dumper? If so, how do we merge this code? My first thought is a different make target, and instead of maintaining two incompatible copies of e.g. disp_direct.c, we have something like src/disp_direct_portable.c or maybe src/disp_direct.c and src/portable/disp_direct.c.
The portable rom dumper tool allows getting rom dumps from many cams, using the same ML code: https://www.magiclantern.fm/forum/index.php?topic=16534.0
As far as I can tell, the way this is managed in source control is unusual and difficult to maintain: a separate branch, "recovery" is used, with radical changes to core source files and make profiles. No attempt seems to have been made to plan for integrating this with other branches at a future date.
See e.g. src/disp_direct.c which very clearly shows this if you diff between recovery and unified (or lua_fix), via "hg diff src/disp_direct.c -r recovery:lua_fix". If you try and diff the whole branch... well, enjoy yourself, it's a 57k line diff. Because each branch will have had multiple other, different, branches merged into them at various points over the 10+ years these branches have been separate.
Do we want the functionality of portable rom dumper? If so, how do we merge this code? My first thought is a different make target, and instead of maintaining two incompatible copies of e.g. disp_direct.c, we have something like src/disp_direct_portable.c or maybe src/disp_direct.c and src/portable/disp_direct.c.