https://gitlab.synchro.net/main/sbbs/-/commit/00887785c8bde0ee2eb72d01
Added Files:
xtrn/ansiview/settings.ini xtrn/avatar_chat/avatar_chat.ini xtrn/bublbogl/server.ini xtrn/chickendelivery/server.ini xtrn/dicewarz/dice.ini xtrn/dicewarz2/dice.ini server.ini xtrn/dpoker/dpoker.ini xtrn/druglord/server.ini xtrn/fatfish/server.ini xtrn/gooble/server.ini xtrn/jeopardized/settings.ini xtrn/lemons/server.ini xtrn/lord/lord.ini lordsrv.ini xtrn/maze/server.ini xtrn/oneliners/settings.ini xtrn/starstocks/server.ini xtrn/startrek/server.ini xtrn/synchronetris/server.ini synchronetris.ini xtrn/syncwall/server.ini service.ini xtrn/synkroban/server.ini xtrn/synthkart/synthkart.ini xtrn/thirsty/game.ini xtrn/uberblox/server.ini xtrn/wordem/server.ini
Modified Files:
xtrn/CLAUDE.md xtrn/ansiview/install-xtrn.ini xtrn/avatar_chat/install-xtrn.ini xtrn/bublbogl/install-xtrn.ini sysop.doc xtrn/chickendelivery/install-xtrn.ini xtrn/dicewarz/install-xtrn.ini xtrn/dicewarz2/install-xtrn.ini sysop.doc xtrn/dpoker/install-xtrn.ini xtrn/druglord/install-xtrn.ini xtrn/fatfish/install-xtrn.ini xtrn/gooble/install-xtrn.ini xtrn/jeopardized/install-xtrn.ini xtrn/lemons/install-xtrn.ini xtrn/lord/install-xtrn.ini xtrn/maze/install-xtrn.ini sysop.doc xtrn/oneliners/install-xtrn.ini xtrn/starstocks/install-xtrn.ini sysop.doc xtrn/startrek/install-xtrn.ini xtrn/syncdoom/install-xtrn.ini xtrn/synchronetris/install-xtrn.ini sysop.doc xtrn/syncwall/install-xtrn.ini xtrn/synkroban/install-xtrn.ini xtrn/synthkart/install-xtrn.ini xtrn/thirsty/install-xtrn.ini xtrn/uberblox/install-xtrn.ini sysop.doc xtrn/wordem/install-xtrn.ini
Removed Files:
xtrn/ansiview/.gitignore xtrn/avatar_chat/.gitignore xtrn/bublbogl/.gitignore xtrn/chickendelivery/.gitignore xtrn/dicewarz/.gitignore xtrn/dicewarz2/.gitignore xtrn/dpoker/.gitignore xtrn/druglord/.gitignore xtrn/fatfish/.gitignore xtrn/gooble/.gitignore xtrn/jeopardized/.gitignore xtrn/lemons/.gitignore xtrn/lord/.gitignore xtrn/maze/.gitignore xtrn/oneliners/.gitignore xtrn/starstocks/.gitignore xtrn/startrek/.gitignore xtrn/synchronetris/.gitignore xtrn/syncwall/.gitignore xtrn/synkroban/.gitignore xtrn/synthkart/.gitignore xtrn/thirsty/.gitignore xtrn/uberblox/.gitignore xtrn/wordem/.gitignore
Log Message:
Revert the xtrn door .ini renames: they abort a sysop's pull
0aa214f366 renamed 28 tracked door configs to <name>.example.ini. Git cannot untrack a file without deleting it from every working tree, and a locally modified one blocks the merge -- so a sysop who had edited any of them got
error: Your local changes to the following files would be overwritten by
merge: xtrn/gooble/server.ini ... Aborting
and could take no Synchronet update at all until they fixed it by hand. A
sysop with an unedited copy got no error: git deleted the config, and the
door then failed (starstocks/stars.js and synchronetris/service.js
return_error on a missing server.ini) or quietly switched to local-only
play (chess, seabattle). Reported by Keyop, updating 337105e069.
No in-repo remedy reaches them -- update.js and install-xtrn both run after
a pull that never completes -- so restore the 28 files. Anyone whose pull succeeded had no local edits, so they come back byte-identical; anyone still blocked can now pull with their edits intact.
Kept, since none of it renames a tracked file: the install-xtrn.js fixes ([copy:] before [ini:], and -auto keeping an existing destination instead of aborting), and the [copy:] + .gitignore wiring for the 21 doors whose live
.ini was never tracked (utopia, syncduke, syncarcade, the scummvm set, ...).
xtrn/CLAUDE.md records why this can't simply be re-landed later.
Co-Authored-By: Claude Opus 5 (1M context) <
noreply@anthropic.com>
---
■ Synchronet ■ Vertrauen ■ Home of Synchronet ■ [vert/cvs/bbs].synchro.net