Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Could you combine gnucobol2 with gnucobol repo? #67

Open
GitMensch opened this issue Nov 8, 2022 · 9 comments
Open

Could you combine gnucobol2 with gnucobol repo? #67

GitMensch opened this issue Nov 8, 2022 · 9 comments

Comments

@GitMensch
Copy link
Collaborator

I know that cross-posting is "not nice", but I wasn't sure on the awareness of https://github.com/OCamlPro/gnucobol2/issues/1 so:

[gnucobol2] has a much longer history (back to https://github.com/OCamlPro/gnucobol2/commit 6c03b34fc4159a993d0f223bb480b58bc4a453e6) and all branches, which lights up the hope that it may be possible to:

  • update the [gnucobol2] repo (= we'd get everything that is actually in)
  • create missing branches for OCamplPro contributions which currently only exist in the gnucobol repo with its content
  • rename gnucobol to gnucobol-old and gnucobol2 to gnucobol
@lefessan
Copy link
Member

I just gave another attempt at migration SVN -> GIT. I created three Github projects:

They are supposed to be updated every 10 minutes from the SVN, I will check in a few days if everything works correctly (i.e. updates are pushed), in which case we could decide to use them.

@GitMensch
Copy link
Collaborator Author

That looks quite nice! I guess this should also work with "local" branches (like the ocaml ones we have here)?

@lefessan
Copy link
Member

Yes, actually, it could be done in both ways, i.e. merging on Github would commit on SVN, but I haven't tried it (and it makes me a little scary of breaking everything...)

@GitMensch
Copy link
Collaborator Author

Please let's leave GitHub as a "mirror + " only (one way).
BTW: can you please share the notes how you setup gnucobol3 and do the automated sync from upstream?

@lefessan
Copy link
Member

lefessan commented Feb 24, 2023

To create the repo:

svn2git svn+ssh://[email protected]/p/gnucobol/code 
git remote add origin [email protected]:OCamlPro/gnucobol3.git
git push --mirror

@lefessan
Copy link
Member

To update it from crontab every 10 minutes:

yes | /usr/local/bin/svn2git --rebase
git push origin --all
git push origin --tags

@lefessan
Copy link
Member

Not complex, just takes a lot of time the first time to go through 5000 commits

@GitMensch
Copy link
Collaborator Author

The notes above miss the part how to split the external-docs out to a separate repo.

@lefessan
Copy link
Member

So, I have restarted my efforts, and the result is here:

https://github.com/OCamlPro/gnucobol4

This time, all the authors are correctly handled.

Note that I have already switched the gnucobol-docs and gnucobol-contrib to use these mirrors (as they almost had no contributions, except one for docs).

The next operations should be:

  • warn all users of what is going to happen
  • wait some time (a few days ? a few weeks ?)
  • rename ocamlpro/gnucobol to ocamlpro/gnucobol2
  • rename ocamlpro/gnucobol4 to ocamlpro/gnucobol
  • tell all users that the renaming was done

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants