FAQ SVN to GIT: what changed
Revision 1 to 2. Removed lines have a minus sign; added lines have a plus sign.
| Old | New | Line | |
|---|---|---|---|
| 1 | 1 | ## Where is the new GIT repo | |
| 2 | 2 | ||
| 3 | 3 | - <https://gitlab.com/freepascal.org/fpc> | |
| 4 | 4 | - <https://gitlab.com/freepascal.org/lazarus> | |
| 5 | 5 | ||
| 6 | 6 | And a mirror (FPC and Lazarus) at | |
| 7 | 7 | ||
| 8 | 8 | - <https://github.com/fpc> | |
| 9 | 9 | ||
| 10 | 10 | And for Lazarus | |
| 11 | 11 | ||
| 12 | 12 | - <https://sourceforge.net/p/lazarus/laz.git/ci/main/tree/> | |
| 13 | 13 | ||
| 14 | 14 | (As long as Sourceforge supports it) | |
| 15 | 15 | ||
| 16 | 16 | ## Where can I get help to use GIT | |
| 17 | 17 | ||
| 18 | 18 | There are 2 pages to help moving from SVN to GIT. Each page is a full "SVN to GIT" overview. The pages are alternatives to each other. You should choose one and stick with that one. | |
| 19 | 19 | ||
| 20 | 20 | - [[FPC git]] (based on old/established "git checkout") | |
| 21 | 21 | - [[SVN to GIT Cheatsheet]] (based on new "git switch") | |
| 22 | 22 | ||
| 23 | 23 | - <https://git-scm.com/docs> (the official Git help) | |
| 24 | 24 | - [GIT Succinctly](https://www.syncfusion.com/succinctly-free-ebooks/git) - Free Ebook (PDF, MOBI, EPUB) from SyncFusion. | |
| 25 | 25 | ||
| 26 | 26 | ### How can I get the (checkout/download) sources from GIT | |
| 27 | 27 | ||
| 28 | 28 | See the above pages. | |
| 29 | 29 | ||
| 30 | 30 | Install a git client (command line) and run | |
| 31 | 31 | ||
| 32 | - | ||
| 33 | - | ||
| 32 | + | ```text | |
| 33 | + | git clone https://gitlab.com/freepascal.org/fpc/source.git my_local_dir | |
| 34 | + | git clone https://gitlab.com/freepascal.org/lazarus/lazarus.git my_local_dir | |
| 35 | + | ``` | |
| 34 | 36 | ||
| 35 | 37 | After that (to update) | |
| 36 | 38 | ||
| 37 | - | ||
| 39 | + | ```text | |
| 40 | + | git pull | |
| 41 | + | ``` | |
| 38 | 42 | ||
| 39 | 43 | Then use (depending which guide you follow) | |
| 40 | 44 | ||
| 41 | - | ||
| 42 | - | ||
| 43 | - | ||
| 44 | - | ||
| 45 | + | ```text | |
| 46 | + | git checkout main | |
| 47 | + | git checkout fixes-2_2 | |
| 48 | + | git switch main | |
| 49 | + | git switch fixes-2_2 | |
| 50 | + | ``` | |
| 45 | 51 | ||
| 46 | 52 | ## Why did we move to GIT | |
| 47 | 53 | ||
| 48 | 54 | There are many reasons. Some of them were: | |
| 49 | 55 | ||
| 50 | 56 | - For those who make commits to the project, GIT offers a lot of useful feature.\ | |
| 51 | 57 | That is: **Perceived as useful** by those who make the commits. And therefore helping the daily workflow of the team. (It doesn't matter, if those features are overall better or worse than SVN. They are better for those who work most with the repository) | |
| 52 | 58 | - Local branches, as quick temp storage (not svn shelves / that would be git stash) | |
| 53 | 59 | - This can be used as "savepoint" while working on a commit. (Saving a partial commit, in case one needs to roll back) | |
| 54 | 60 | - Storing an unfinished attempt on some idea | |
| 55 | 61 | - Easy switching between branches | |
| 56 | 62 | - **Syncing between different machines** (Laptop, Virtual machine) without needing an (external) server. This helps tremendously with testing for different platforms. | |
| 57 | 63 | - Working offline | |
| 58 | 64 | - Personal forks of the repo. For example to share a patch by publishing a branch (unfinished work / may still need to be completely redone) on your personal fork. | |
| 59 | 65 | - ... (I need to go through old mails to find the remaining reasons) | |
| 60 | 66 | - Maintenance: Hosted solution (see "Why GitLab"). To the best of our knowledge there is no hosted SVN platform offering even half of what hosted GIT platform offer.\ | |
| 61 | 67 | This includes the high maintenance cost of running Mantis | |
| 62 | 68 | ||
| 63 | 69 | Note that several team members have in the past already used "git svn" and similar solutions. Despite the downsides (e.g. git svn, is really slow to update), this means that the above points are not just hopeful assumptions. The listed "perceived git advantages" have already been experienced by those team members. | |
| 64 | 70 | ||
| 65 | 71 | On the long run, we may also be able to use the additional features offered by the hoster (that would have applied to GitHup or GitLab), such as CI integration. But that's to be seen in future. | |
| 66 | 72 | ||
| 67 | 73 | ### Why GitLab | |
| 68 | 74 | ||
| 69 | 75 | Self hosting becomes more and more involved. Aside from the technical maintenance needs, the legal requirements are getting bigger and bigger. In order to protect our self, and save time we decided to use a hosted platform. | |
| 70 | 76 | ||
| 71 | 77 | - GitLab offers a very good deal to open source projects. Better than GitHub, at this time. | |
| 72 | 78 | - GitLab is open source. If ever we need to self host again, we have the choice to keep the platform. | |
| 73 | 79 | ||
| 74 | 80 | ### Why now | |
| 75 | 81 | ||
| 76 | 82 | The old server would have had to be replaced now. So we were at a point where we had to invest considerable time and effort in any way we could go. Given that the move to Git had been decided, there was no point to invest time into temporarily extending SVN. | |
| 77 | 83 | ||
| 78 | 84 | ## What if I really can't switch to GIT | |
| 79 | 85 | ||
| 80 | 86 | We have mirrors at GitHub. And GitHub (currently) allows to access them with an svn client. (see the drop-down for the "clone url"). | |
| 81 | 87 | ||
| 82 | 88 | However, this should be only used as a last resort. The teams do not have any plans to invest time into supporting this. It is there as long as GitHub offers it for free. | |
| 83 | 89 | ||
| 84 | 90 | Further, it is incompatible with the old svn. GitHub reverse translates it from git. So each revision gets a new arbitrary revision number. And those numbers can not be used to report/discuss issues. No one in the team uses this svn-mirror, so non of us has access to those revision numbers. To report issues you need the git sha1. | |
| 85 | 91 | ||
| 86 | 92 | --- | |
| 87 | 93 | *From the Free Pascal wiki, page "FAQ SVN to GIT", as it stood on 2022-01-13 after a change by Trev, out of the wiki's dump of 2024-05-26. Copyright stays with the author who wrote it, according to the old wiki's [[Licensing]] page. If you have concerns about this material, [message the admin](/wiki-contact).* | |
| 88 | 94 | Category: Version Control |