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.
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 ?
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?
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?
See my 2nd post.
We "forgot" to move some bug from mantis to gitlab. We are doing that now.
But in order to be able to do that, we need to disable access.
----------
Should have been better communicated. But it was just realized maybe an hour ago. I even forgot when I made the first reply earlier....
When migration will be done can be "bugs.freepascal.org" redirected to new location on GitLab?
yep.Thanks for the tips Martin. I struggled a bit with getting the rebased github branch into gitlab, but eventually got it working.
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.
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.
Another alternative way. Export all commits your are interested in as a patch. Followed by an import all patches into your new repo.Hi Alfred, thanks for the alternative. Git certainly is very flexibile.
Example of export:
git format-patch --output-directory "../patches" --root origin --since="Dec 25, 2020"
It will be removed once the conversion is done.If possible, I would like to ask for the non-changing sources (and binaries) to remain available through SVN for at least another year. Non-changing: everything except trunk and current fixes.
QuoteIt will be removed once the conversion is done.If possible, I would like to ask for the non-changing sources (and binaries) to remain available through SVN for at least another year. Non-changing: everything except trunk and current fixes.
As the (future) releases (binaries) will still be hosted on on sourceforge (if I understood correct), a second request might be to make the accompanying sources of these releases also available through SVN.
If possible, I would like to ask for the non-changing sources (and binaries) to remain available through SVN for at least another year. Non-changing: everything except trun,k and current fixes.This means the fixes branches of releases, right?
However, I meant to have the non-changing sources remain available for a while to make the transition a bit smooth.The non-changing branches will remain in your computer's HD once you have downloaded them.
However, I meant to have the non-changing sources remain available for a while to make the transition a bit smooth.
I think this is about fpcupdeluxe.Yes it is. I would have preferred all non-changing installs (all stables from present to past) to remain valid.
Fpcupdeluxe has now an experimental implementation.Its already broken again, the repository is now "testconversion" and not "testconversion2" anymore :-(
Fpcupdeluxe has now an experimental implementation.Its already broken again, the repository is now "testconversion" and not "testconversion2" anymore :-(
I wonder why the svn server has been taken down before everything is in place on gitlab with permanent repository urls.
Was it really necessary to take down the svn server before everything is in place on gitlab?
It wasn't planned...
We had aimed to move on the 14th (start + 2 or 3 days for the move)
We've tested the move over and over in the past 2 month.
But despite this, some last minute issues came in. (not all technical, but some technical).
So we where forced to move it back by one week. (knowing that the server would go offline at the end of the month).
And then it took more than the 3 days planed...
Of course, even that would have left "only" 2 weeks for everyone to switch from svn to git.
Btw, Lazarus repro is avail on the Github mirror, including githubs "git to svn" svn access. (which you may be able to use in FpcUpDeluxe for the time being)
That said, retrospectively a lot could have done better. Better communicated too.
But, this isn't our normal line of work. So we didn't foresee every detail.
If we were starting the move now, with the knowledge we gained => that would be a diff story.
Fortunately I have btrfs and snapshots, otherwise I would not have a working Lazarus installation anymore now :-/.
Someone needs to check if FpcUpDeluxe works with SVN access to:
https://github.com/fpc/Lazarus.git
Yes it says .git. But github supports svn on that url.
Mind, keep to tags => revision numbers will be diff from the existing, as this is translated back from the git repro.
(On the other hand, it even gets new commits)
Can i use the Windows GUI version of TorteiseSVN with Git ?You mean TortoiseGit?
Beware though, while "TortoiseGit" and "TortoiseSVN" might look (and sound) alike, they're not the same.
In fact you will need understanding of git itself, in order to use TortoiseGit well.
Beware though, while "TortoiseGit" and "TortoiseSVN" might look (and sound) alike, they're not the same.
In fact you will need understanding of git itself, in order to use TortoiseGit well.
You will actually need git, as it doesn't come with TortoiseGIT. And be prepared for a 20 fold Q&A.
That said, retrospectively a lot could have done better. Better communicated too.
But, this isn't our normal line of work. So we didn't foresee every detail.
If we were starting the move now, with the knowledge we gained => that would be a diff story.
now I need to figure out how to do updates from the repository instead of complete down loads unless the clone feature figures that out for me..
There are corresponding menu entries in the context menu of TortoiseGit.For git starters (and especially TortoiseSVN users), I highly recommend using TortoiseGit on Windows. Otherwise you can use Github desktop client.
I've forwarded this to the core mailing list so that the one responsible for the conversion might take a look.
I've forwarded this to the core mailing list so that the one responsible for the conversion might take a look.
Hi, do you have a link for this?
I can't see anything relevant here
https://lists.lazarus-ide.org/pipermail/lazarus/2021-August/thread.html (https://lists.lazarus-ide.org/pipermail/lazarus/2021-August/thread.html)
Hi Fred,
We were talking about a Lazarus bug being lost, that refers to Lazarus code that does not compile.
https://web.archive.org/web/20201202041052/https://bugs.freepascal.org/view.php?id=37556 (https://web.archive.org/web/20201202041052/https://bugs.freepascal.org/view.php?id=37556)
Native fpgui compiles just fine.
I've forwarded this to the core mailing list so that the one responsible for the conversion might take a look.
Hi, do you have a link for this?
I can't see anything relevant here
https://lists.lazarus-ide.org/pipermail/lazarus/2021-August/thread.html (https://lists.lazarus-ide.org/pipermail/lazarus/2021-August/thread.html)
I noticed 37556 had gone because I'm the reporter. I guess my main concern, is that if one bug got lost in the move, how many others went missing?
Restored: https://gitlab.com/freepascal.org/lazarus/lazarus/-/issues/39354
OK, but it's not possible to find out from the IDE whether a particular patch etc. has been applied?
OK, but it's not possible to find out from the IDE whether a particular patch etc. has been applied?
MarkMLl
That'll show a result in main, and no result in fixes_2_2.
YMMV.
git log --oneline origin/main | grep 52f2a8b88f git log --oneline origin/fixes_2_2 | grep 52f2a8b88f
That'll show a result in main, and no result in fixes_2_2.
@Dsiders: While you did not put it as a question, I add some more answer anyway (not reaching 100+ though):
...
does not work if there was a conflict, or if the merge for some other reason was modified.
From my "main" build:
Lazarus 2.3.0 rmain-2_3-306-gbbe0b81f62 FPC 3.2.0 x86_64-win64-win32/win64
That is "git desclibe"
306 commits since the tag main-2_3 on commit bbe0b81f62
The 306 is not always "exact". In case of branches (within main) it could be on either side. After a merge it counts both sides.
For this to work the compiled IDE would need to have the entire git log compiled into it, that would currently be 61115 entries in the main branch as of today.That'll show a result in main, and no result in fixes_2_2.But I'm not asking about the repository, I'm asking about the IDE.
YMMV.
From my "main" build:
Lazarus 2.3.0 rmain-2_3-306-gbbe0b81f62 FPC 3.2.0 x86_64-win64-win32/win64
That is "git desclibe"
306 commits since the tag main-2_3 on commit bbe0b81f62
The 306 is not always "exact". In case of branches (within main) it could be on either side. After a merge it counts both sides.
If git describe is called withthen it will not search along merge branches.
--first-parent
For this to work the compiled IDE would need to have the entire git log compiled into it, that would currently be 61115 entries in the main branch as of today.I had to look it up the original question was
OK, but it's not possible to find out from the IDE whether a particular patch etc. has been applied?
No, but it wasn't before.
Say you knew a patch was applied in svn 55123 and the IDE was at 55500, then you still had to check that 55123 was on the same svn branch (fixes or trunk) as the IDE build on 55500.
If I have commits on main as follows:However if I am on C5 then first-parent makes a diff
main-2_3 => C1 => C2 => C3 => C4=> M => C5 \> M1 => M2 =^
- with first-parent: main-2_3- 6 -gC5
- without first-parent: main-2_3- 8 -gC5