Forum > Lazarus
We are now using GIT
Martin_fr:
--- Quote from: Artlav on July 26, 2021, 12:21:15 pm ---Was FPC issue tracker fully moved over? I can't find any of the recent issues, i.e. https://bugs.freepascal.org/view.php?id=39275
At least some of the old ones as well, actually.
Also, any plans for redirects? The old links are giving rather unhelpful 403 messages.
--- End quote ---
FPC is still moving
They will have an issue tracker in the same gitlab account, but in their sub group.
ccrause:
Anyone knows how to move a branch with commit history from Github to GitLab and preserve commit history? Work started as a branch of a fork of Martin's Lazarus Github mirror. Would like to move this branch across to a fork of the official GitLab Lazarus project if possible.
I can recreate the branch from scratch and copy the changes across, but this would not have the commit history.
Martin_fr:
yep.
Checkout both repositories.
It your github clone, add a new remote, as url use the path to your gitlab checkout.
git remote update.
now you have both in the same local repro.
--- Code: Text [+][-]window.onload = function(){var x1 = document.getElementById("main_content_section"); if (x1) { var x = document.getElementsByClassName("geshi");for (var i = 0; i < x.length; i++) { x[i].style.maxHeight='none'; x[i].style.height = Math.min(x[i].clientHeight+15,306)+'px'; x[i].style.resize = "vertical";}};} ---git rebase --reapply-cherry-picks --onto <commit_in_new_local_gitlab> <upstream_in_old_githup_e_g_master> <branch_in_old_github>
Then push the rebased branch to your local gitlab clone.
Unfortunately some files in the conversion are checked in with wrong line endings.
This can, if you switch to older commits, lead to files showing as modified, and blocking rebase. In that case make sure you are on "main" head, before starting rebase.
You can also temporary create a file .git/info/gitattributes and put the affected files in there as binary (IIRC /path/file -text )
Or disable core.autocrlf
DonAlfredo:
Another alternative way. Export all commits your are interested in as a patch. Followed by an import all patches into your new repo.
Example of export:
--- Code: Pascal [+][-]window.onload = function(){var x1 = document.getElementById("main_content_section"); if (x1) { var x = document.getElementsByClassName("geshi");for (var i = 0; i < x.length; i++) { x[i].style.maxHeight='none'; x[i].style.height = Math.min(x[i].clientHeight+15,306)+'px'; x[i].style.resize = "vertical";}};} ---git format-patch --output-directory "../patches" --root origin --since="Dec 25, 2020"
Martin_fr:
Gitlab has been working fine for me all the time. Both webpage and repro access.
Maybe some routing on the way.
Or maybe your IP was in the same range as that of someone doing malicious stuff?
--- Quote from: jamie on July 26, 2021, 11:06:27 pm ---
btw.
What do I need to do change my SVN URL in the existing trunk I have ? I am using the windows desk top version of it.
I know where the URL properties are, do I need only to change that or do I need to do a complete checkout again ?
--- End quote ---
The url is on the github site. Just drop down the "clone" button. (as if you wanted the git link / svn is the same link)
Since github reverse translates git to svn, all the revision numbers will have changed. I doubt you can simply change the url in your client. (But I have not tested, maybe it does something useful, or at least recoverable...)
I guess remove the current checkout, and do a new checkout.
And again, while the choice to use this is there, the svn revision numbers will be useless in conversations about what works and what does not.
No one in the team (afaik) has that checkout. So we will have no idea what any rev number actually points to.
Navigation
[0] Message Index
[#] Next page
[*] Previous page