Thats.... amazing. Thanks Trance!It takes me about 1 minute: This is the process I’ve always followed for keeping packs in sync.
I have the following workplace folders in my IDE, all of which are uploaded to a Subversion/SVN server:
Here’s the workflow, assuming main and revision are on the same revision (last synced):
- main (the main project)
- revision (current revision synced with main)
- vanilla (Lucera's Subversion)
If there’s any patch mismatch, I simply uncheck the files with errors, make a note of them, and apply those manually later (while I auto import the rest). Using this process, it typically takes between one and a few minutes. I usually update every few days, so there’s never too much to apply at once. Keeping the server up to date is good—when you avoid applying too many changes at once, it becomes much easier to trace issues and identify which revision caused them.
- I update vanilla to the latest revision (head).
- I delete authserver and gameserver from revision.
- I replace them with the latest authserver and gameserver from vanilla.
- Now, I generate the diff patch on revision. I export it to apply it to main.
- I commit the revision folder with the latest changes, commenting: "Revision: 445".
- I import the diff patch to main and commit it, commenting: "Main: 445". Before importing the diff patch, you need to manually mass replace /config/default_english/ with /config/. Also, you’ll need to manually copy and paste the .jar files into the main.
I hope this makes the process clear.
For those looking to replicate this, you can use VisualSVN for Windows (it’s free). Personally, I always run a Subversion server on a cheap VPS to handle main and revision—I use Mac.