Files & Folders Patch Pack
I made multiple merge requests on different stuff that take places in the same area of code. The problem is: if every MR looks to be mergeable on master, they go insanely conflicting when trying to merge them one after one.
For example the cmdline
MR !55 (closed) and lastfolder
MR !46 (closed) are adding code at the exact same place, and git can't know by itself what to do in this case:
-
cmdline
MR excerpt:
@@ -933,4 +933,6 @@ void Map_LoadFile( const char *filename ){
ScopeDisableScreenUpdates disableScreenUpdates( "Processing...", "Loading Map" );
+ MRU_AddFile( filename );
-
lastfolder
MR excerpt:
@@ -933,4 +933,6 @@ void Map_LoadFile( const char *filename ){
ScopeDisableScreenUpdates disableScreenUpdates( "Processing...", "Loading Map" );
+ g_strLastFolder = g_path_get_dirname( filename );
This kind of simple things can make merging very annoying.
So, this MR ships all these others MR with all merge issues resolved:
- !58 (closed) (really) fix map saving and renaming (save as) (ref #105 (closed))
- !60 (closed) [dpkdir] introducing dpkdeps.h
- !55 (closed) add command line support, fix #42 (closed)
- !46 (closed) remember last opened folder, fix #30 (closed)
- !61 (closed) really filter notex
- !48 (closed) fix homedir version, follow xdg guidelines
If you're OK with all these changes, you can merge this one to save many headaches, and close all the related MR.
You can also compile that files
branch to get an overview of how all these improvements glued together makes the user experience far far more polished, because all these MR are about making user interaction a more polished experience.
I had a special care to make each commit easily readable, so reviewing commit per commit is a bit like reviewing all these MR one at a time.