|
From: Björn K. <Va...@jE...> - 2025-07-07 00:05:04
|
Hi Dale, sorry, I was on vacation. Nice to see you back. Yes, as I wrote, the canonical repository / source of truth is now the Git repository at SourceForge with a read-only mirror at GitHub, first and foremost for now to use GitHub Actions as CI environment. There is no sync happening between Git and SVN, in SVN you only find a gravestone redirecting you to Git. The Git repository is now also a combination of all jEdit history, including things only laying around on Slava's disk, GJT CVS, SF CVS, and SF SVN. This is only true for the jEdit core repository though if that was unclear. I'll migrate those over to Git too. But first I prepared some additional niceties for jEdit core, that I will polish and test some more, now that I'm back from vacation and then push and write to the dev list about it. Cheers Björn Am 23.06.2025 um 23:35 schrieb Dale Anson: > Hi Björn, > > I've been out of it for a while, trying to catch up. Thanks for the > work on the git migration! Does that mean that git is now the main > source for jEdit code, or are the svn and git repositories synced so > either one works? > > On Sat, Mar 22, 2025 at 11:02 AM Björn Kautler <Va...@je...> wrote: > > Hi > > Finally it is finished again, sorry for the really long delays. > > Also this time each originally SVN revision was checked > file-by-file to > be identical with the Git commits, > so this time there should not be such a mixed-up state in the history > like with the last try. > > The canonical jEdit core repository can now be found again at > https://sourceforge.net/p/jedit/jEdit. > > Each originally SVN revision is also annotated to the Git commit > using > git-notes, so if you want to find a Git commit by the original SVN > revision, > you can after cloning use `git fetch origin > refs/notes/*:refs/notes/*` > to get the commit notes that contain the SVN revisions. > If after that your Git client does not display the notes, then it > probably lacks support for them and you should open a feature request. > Things like `git log`, `gitk`, or `tig` support them, so there you > can > double-check that they are present. > > Additional to the canonical repository, I created a read-only > mirror at > https://github.com/jEdit-editor/jEdit/. > It cron-based mirrors the canonical repository once an hour, > but it should also mirror immediately after a push to the canonical > repository as that triggers a webhook that starts the mirroring. > If that does not work anymore, please drop me a line so I can have > a look. > > For the GitHub repository I also added a GitHub Actions workflow that > automatically builds jEdit > on a Linux runner, a Windows runner, and a macOS runner and also > provides that built artifacts > as result of the Action run, so now we do not only have daily builds > again, we even have continuous builds now > that run directly after each push: > https://github.com/jEdit-editor/jEdit/actions/workflows/build.yaml > > I'll have a look at migrating the plugins' history next. > > Cheers > Björn > > > PS: I'm sure you are all aware but just to be sure, please keep in > mind > to use rebase for non-pushed commits, not merge. > "Ladder"-histories are really not nice to look at or > investigate. :-) > > > > -- > ----------------------------------------------- > jEdit Developers' List > jEd...@li... > https://lists.sourceforge.net/lists/listinfo/jedit-devel > |