On Sun, Oct 27 05:23:30 -0500, you wrote:
Working:
/sbbs/exec
/sbbs/ctrl
/sbbs/xtrn
...
Source Tree:
/sbbs/repo/src
/sbbs/repo/ctrl
/sbbs/repo/xtrn
...
I have too many of the JS files modified and don't want to accidently
screw anything up so just copy JS files that have changed/new etc.. manually I'm sure there are much easier ways to do it, but this is the
way I do it. works for me :) and theres really not much I have to put
into it.
I don't think you're doing anything different that most others here. I think the above setup is pretty standard. At least that's how it is here, as well. The initial 'clone' of git sets it up this way, for the exact purpose that you're not overwriting what you already have going on.
Any of your modified .JS files should be copied to your /sbbs/mods directory, where they won't be overwritten by git in any case, but will be read by Synchronet before the one located in /sbbs/exec. Once you have that setup, you can safely copy everything from /sbbs/repo/exec to /sbbs/exec after you pull updates from git, rather than tracking what was modified and copying them one at a time, manually.
The modified .js files in /sbbs/mods will need to be updated/diff'd/merged manually, though. But this is the proper way to separate them so whatever changes you've made don't get overwritten and you can continue to update Synchronet from git without accidentally screwing anything up.
Sometimes, if my changes to a .js are minimal (a couple/few lines), and the repo changes to the same .js are more substantial than what I've done, I'll just rename my current script, copy the newly updated one to my mods directory, and then copy/paste my changes into the new one. Otherwise, if the repo changes are minimal, I'll just see what the changes (diffs) were on github and add/remove those modifications to the script I'm already using.
Regards,
Nick
... Take my advice, I don't use it anyway.
--- Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:128.0) Gecko/20100101 Thunderb
* Origin: The Pharcyde ~
telnet://bbs.pharcyde.org (Wisconsin) (1:154/10)