[fpc-devel] using git /// Re: [RFC] Modernising the FPC Release Process -- Proposal for Review

[Martin Frb]

On 17/04/2026 18:19, Marco van de Voort via fpc-devel wrote:
>
> Op 17-4-2026 om 17:48 schreef Michael Van Canneyt via fpc-devel:
>>
>> Maybe use another tool than tortoisegit ?
>> I used it in the past. It's an ill-conceived fork of tortoisesvn.
>
> It is much worse than T-SVN was. But it works in a pretty vanilla 
> install, and does not require a bunch of scripting for basic 
> operations. That lessens keeping heaps of scripts synchronised between 
> machines. Keep in mind that I mostly work on single commits on 
> multiple machines. Having everything stashed in some local branch is 
> not workable for me.
It is probably not what you want (may even be overkill in your case / 
i.e. for a single commit), but you can sync git repos between different 
machines => without any gitlab.
Just as long as those machines at some time are in the same LAN
- e.g your laptop can update from you PC
- but, you PC at work, may not be able to update from/to your PC at home 
(unless their is a VPN)

Happy to help / answer questions. If it is of any interest.

>> I don't much care for UI tools but what I see from my colleagues who 
>> do use
>> UI tools, none of them has to do so many clicks as you describe.
>
> Then retest. Make sure you have a few files dirty, even if only a few 
> .lpi's for e.g. the compiler or so (because you added a few run 
> parameters). I can make a video?
I am kind of seeing both of your sides.

Yes, Marco's scenario can happen. But for it to happen frequently on all 
3 FPC repos => that seems to be rather unlucky. (according to my experience)

I.e.
Marco, if you have the fpc.lpi modified => git pull should only complain 
if that file changed in the upstream repo. I wouldn't expect LPI to do 
that so often. But of course there could be some other file that changes 
frequently.

There is autostash. But I haven't played with it. Afaik that would mean 
as long as their is no conflict, any pull goes fast forward. (even if 
there are changed files)... But again, not tested.

But, to conclude, apart from "frequent or not", those extra steps in 
updating do indeed happen. And they do with any tool.


---
Btw, I use Tortoise myself.
Yes it lacks a bit with regard to standard git flows  (though some of 
them I do diff, even when using console git).

But, TG has sofar the best integration into Windows (explore) that I 
have seen.  (And on a Windows PC, I use Windows means)