Forum > General

Update FPC fork

(1/2) > >>

SymbolicFrank:
I have an FPC fork on GitLab to create pull requests. How do I update that to the current FPC version? It isn't a paid account, so mirroring doesn't work.

Thaddy:
No not fork. No help required.
Do you have a good reason for it? Better be a good one...

SymbolicFrank:
Well, I made it to make a pull request to fix my bug reports about a few problems with DBF files. Now it seems that I have to extend the TMSSQLConnection.

I hope I don't have to make a new fork and configure the build environment again, it was a lot of work. I just want to update it (pull) to a copy of the current FPC repository.

Martin_fr:

--- Quote from: SymbolicFrank on September 27, 2022, 03:51:31 pm ---I have an FPC fork on GitLab to create pull requests. How do I update that to the current FPC version? It isn't a paid account, so mirroring doesn't work.

--- End quote ---

And you have a clone of that fork on your local PC?

Add the original FPC gitlab url as a 2nd remote to your local clone.

--- 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 remote add fpc http://...... (or use your git gui...)

Then you can pull or "git remote update" from each remote.

You can then push to your fork.
For this you should have a local branch that "tracks" origin/main (assuming your fork remote is called "origin" / as is default / "git remote -v")
The easiest is probably if that branch is NOT your work branch.
That is if you committed your changes to "main" (local branch main) then you may use another name.


--- 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 switch -c fork-main --track  origin/maingit merge --ff-only fpc/maingit push 
If the merge doesn't work: git stash push ; git switch -f -C fork-main fpc/main ; git stash pop
Note, this form of git switch will not ask questions, it clears changes in your work tree, and move the branch, which in other scenarios can mean commits that are only on that branch are "kinda dropped".

SymbolicFrank:
Ah, in that way. Thanks, I'm going to try try that (very carefully ;) ).

Yes, the GitLab fork is for publishing the pull request, I have cloned it locally.

Navigation

[0] Message Index

[#] Next page

Go to full version