Depends on what's included in peq db if anything. If nothing is included, check the changelog for rev 2380, and source them in in that order - mercs.sql will probably be last of those. Then all of the svn updates, then the git updates.
Confusing for sure, but I'm not sure of a better way, unless we keep an up to date mercs.sql that includes everything, but I don't think I'm supposed to do that.
|