Have completed 1.5 bring up would like to contribute

[clearchris]

I forked your repo, added in the 1.5 commits, and added some of my own patches (more coming). However, github isn't showing mine as a fork of yours, and I can't send a PR. If you are interested, do you have any ideas of how I can sync these up? Thanks!

https://github.com/clearchris/floreantpos

[fat-tire]

Cool! That's weird that it doesn't show as a fork...? Did you start it independently or did you start it as a fork? I wonder fi there's a way to retroactively link them?

I haven't been payinig much attention to upstream.. is 1.5 the latest?

[clearchris]

1.5 is the latest, they are up to r1960 in svn. Date is December of 2022.

How I did it was really a mess. I pulled only the new commits via git-svn into a repo, set up your repo as remote, pull, branch off your repo at r1897, cherry-pick the new commits from orocube, cherry-pick your commits, and that's where we are. I'm pretty functional at git, but have zero experience using git as a source control bridge to a corrupted svn repo.

If you can share how you got around the svn corruption issue (actual commands, I have spent too long on this), or if you pulled the new commits (r1898-1960) and made a new branch, I could fork that through github and bring my stuff over to that.

It's really unfortunate how orocube dumped the community when they shut down the forum. I used to post fixes, etc there. Have you heard of much interest? I have been considering starting a discord for floreant.

[fat-tire]

It's been so long I'm trying to remember how I got around the svn corruption. I feel maybe I pulled up to the bad commits, then skipped them, then made my own commit with the same changes, committed that, then continued to pull the rest of the way? Or maybe I somehow got them to jam in there-- it was so long ago I can't remember, but I do recall that ultimately I was able to get everything in and then continue along once the corrupted commits were addressed.

In other words, the git repo should be "good"/uncorrupted. If you look around where the corruption occurred you can see how it was fixed or at least what the state of those commits are now. I can't remember which ones they were.

Since then I've added my own stuff on top to fix various security and build issues that came along, plus added the readme, etc.

I'm thinking on how to get the best of all worlds-- maybe it would look something like this:

1. From your local repo, do a git add remote fattire https://github.com/fat-tire/floreantpos.git Now you'll have both your remote which points to github and is probably going to be called origin and the remote to my repo, which you just named fattire. (git remote show to check them)
2. git pull fattire 2019-fattire-master. This should pull in the default/latest branch with all the commits to date in order.
3. At this point, it sounds like we'll have different commits (with some being the same), but there should be a place where mine end and and the new ones you grabbed from upstream svn start appearing.
4. Assuming there aren't a ton of new commits, you could just git checkout fattire/2019-fattire-master and then cherry pick them right into 2019-fattire-master. They should just go in I think, assuming they don't clash with any of the security fixes or other small things I've changed.
5. You can then make a copy of the branch for your origin I think by git checkout -b origin/2023-fattire-master, then git push origin to send it to github. You may not even need to make a copy of the branch first.
6. If you get it working, maybe I'll copy 2019-fattire master and call it 2023-fattire-master and you can submit a PR there. If you're not able to do it from your repository, you can always fork my repo and then push the branch there to do the PR.

Does this make sense? I may not have all the commands exactly right, but I'm probably semi-close.

ft