Re: Re: GitHub
  By: Nelgin to Digital Man on Wed Aug 26 2020 03:18 pm

 >   Re: Re: GitHub
 >   By: Digital Man to Nelgin on Wed Aug 26 2020 12:38:29
 >
 > So, some time ago I added login to chat_sec.js to load the @smeg mail reader
 > if it exists. I kept this in /sbbs/exec because if there were any changes to
 > chat_sec.js in the future (which there were) CVS would merge my
 > modifications and it worked well.

Until you git a merge conflict, but yes, that's exactly what CVS (and Git) are
intended for. Now you can do the same with git, just copy the file to the
repo's "exec" dir and then symlink it into your sbbs/exec dir.

 > I had no problems. The below procedure
 > would blow away that change. Of course, I could put it in mods but then no
 > updates. So no-win situation.

True, but there's no gaurantee that future updates to that file won't collide
with your changes still. But if you're okay with that possibility, then you can
create the same workflow the git by using a symlink. There are other potential
solutions, but I think if you just have that one (or very few) locally modified
files in your exec dir, then that's the best approach.

 >  > CVS doesn't do some magic thing that you as a sysop needed. If you just
 >  > want to update to the latest executables and scripts, download 2 files
 >  > and extract into your exec dir:
 >  > http://vert.synchro.net/sbbs/sbbsexec.tgz
 >
 > Except it throws a 404...but still, I wouldn't be using that method.

Sorry, remove the "vert." from the hostname.

                                            digital man

This Is Spinal Tap quote #1:
Nigel Tufnel: These go to eleven.
Norco, CA WX: 86.1øF, 48.0% humidity, 18 mph ENE wind, 0.00 inches rain/24hrs
--- SBBSecho 3.11-Linux