search

ormico / dbpatchmanager

Database development tool for change control.
MIT License
6 stars 3 forks source link

improve merge conflicts in patches.json #23

Open ormico opened 3 years ago

ormico commented 3 years ago

Sometimes a bad git merge may attempt to loose some information in the patches list in patches.json if the developer doesn't notice during the merge process.

I've been considering ideas for how to store the patch information in a way that would make it less likely to have a merge problem.

I'm currently considering moving the individual patch information (patch id, depends on list, etc) out of patches.json and into separate files.

I have two ideas about wehre to store these files. The first idea is for the files to all have a standard name (like patch.json) and each be stored in the patch folder it belongs to. For example patch 202103082324-1408-p2 has a folder in Patches named Patches/202103082324-1408-p2.

Alternately, we could have another folder (named something like PatchInfo) and store all the individual files there and name each one after it's patch id. For example PatchInfo/202103082324-1408-p2.json

I'm still working on this idea.

ormico commented 3 years ago

This also relates to the idea of putting a version number in the data file #24 if we change something like where depends on information is stored we will need something like that esp if we want to stay backwards compatible or be able to upgrade older patches.json files.