++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ From greve at lowtem.hokudai.ac.jp Mon Jun 22 06:58:00 2020 From: greve at lowtem.hokudai.ac.jp (Ralf Greve) Date: Mon, 22 Jun 2020 13:58:00 +0900 Subject: [SICOPOLIS:82] SICOPOLIS goes Git Message-ID: Dear colleagues, I hope you are fine and made it safely through the Coronavirus crisis. As you know, the Alfred Wegener Institute has kindly hosted SICOPOLIS on their FusionForge system AWIForge for many years. However, they informed me a while ago that the system will be shut down soon in exchange for a GitLab system. I explored some possibilities how to deal with the situation and came to the conclusion that it is best to follow suit. I am fully aware that this constitutes a major break as Git is very different from Subversion. Personally, I cannot say that I particularly like Git because of its excessive complexity and IMHO illogical syntax. Nor do I know it very well, so that it will involve a lot of learning myself. But OK, can't be helped, I suppose... I would like to hear your opinion about one thing. Converting the entire existing Subversion repository will produce a ~0.8 GB Git repository which every user will have on his/her machine because of the decentralized architecture of Git. I wonder whether this is really the best way to proceed. The alternative would be to keep the existing, big repository only as a legacy backup, but make a fresh start with Git with the current version of SICOPOLIS. The problem with the latter option is that it will not include the active branches maintained by some of you, so you would have to merge them in manually if they are supposed to be in the new Git repository. Please let me know what you think. And, of course, if anything is unclear, let me know likewise. Apologies for the inconvenience! Best regards, Ralf Greve -- Dr. Ralf Greve Professor, Glacier and Ice Sheet Research Institute of Low Temperature Science Hokkaido University Kita-19, Nishi-8, Kita-ku Sapporo 060-0819, Japan Phone: (+81)-(0)11-706-6891 greve at lowtem.hokudai.ac.jp http://wwwice.lowtem.hokudai.ac.jp/~greve/ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ From saitofuyuki at jamstec.go.jp Mon Jun 22 13:43:01 2020 From: saitofuyuki at jamstec.go.jp (saitofuyuki at jamstec.go.jp) Date: Mon, 22 Jun 2020 20:43:01 +0900 Subject: [SICOPOLIS:83] Re: SICOPOLIS goes Git In-Reply-To: References: Message-ID: This is Fuyuki. > I am fully aware that this constitutes a major break as Git is very > different from Subversion. Personally, I cannot say that I > particularly like Git because of its excessive complexity and IMHO > illogical syntax. Nor do I know it very well, so that it will involve > a lot of learning myself. But OK, can't be helped, I suppose... Actually, I already convert most of the SICOPOLIS svn repository to my private git repository. When I hack SICOPOLIS, I always use git for a while, and commit the changes both on my git and the official svn. If you hope, I can help you. Following are git representaion of official svn branches. I do not check but I believe aht almost all the branches and tags are included. svn/LL-OpenAD-branch-01 svn/aori svn/automake-branch svn/cclas-branch svn/cryo-oslo svn/es-fuyuki svn/jb01 svn/obase-branch svn/openmp svn/pik-branch svn/rc-branch svn/rcrg02 svn/rg-branch-01 svn/rg-sandbox svn/rg-test-01 svn/rg-test-02 svn/rg01 svn/sico-rc-01 svn/sico-rc-02 svn/sico-rc-03 svn/tags/ad-v1 svn/tags/pre-release-01 svn/tags/pre-release-02 svn/tags/version30 svn/tags/version31 svn/tags/version32 svn/tags/version33 svn/tags/version51 svn/tg-branch svn/trunk svn/tsato-branch svn/tsato-branch-02 svn/vsf-branch --- SAITO Fuyuki (saitofuyuki at jamstec.go.jp) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ From calov at pik-potsdam.de Mon Jun 22 16:59:53 2020 From: calov at pik-potsdam.de (Reinhard Calov) Date: Mon, 22 Jun 2020 16:59:53 +0200 Subject: [SICOPOLIS:84] Re: SICOPOLIS goes Git In-Reply-To: References: Message-ID: <4ef50db3-fc60-5866-7b51-ce5d74e97ade@pik-potsdam.de> Dear Ralf, I would vote for a fresh start, as I am hesitant to deal with 0.9 Gbyte code on my local machine and it is doable to get my local branch/code to the remote gitlab. I worked with git repositories too. First, it appears bit odd to work with git (e.g. commits are local, etc.), but you will get used to work with git quickly. Cheers, Reinhard Am 22.06.2020 um 06:58 schrieb Ralf Greve: > Dear colleagues, > > I hope you are fine and made it safely through the Coronavirus crisis. > > As you know, the Alfred Wegener Institute has kindly hosted SICOPOLIS > on their FusionForge system AWIForge for many years. However, they > informed me a while ago that the system will be shut down soon in > exchange for a GitLab system. I explored some possibilities how to > deal with the situation and came to the conclusion that it is best to > follow suit. > > I am fully aware that this constitutes a major break as Git is very > different from Subversion. Personally, I cannot say that I > particularly like Git because of its excessive complexity and IMHO > illogical syntax. Nor do I know it very well, so that it will involve > a lot of learning myself. But OK, can't be helped, I suppose... > > I would like to hear your opinion about one thing. Converting the > entire existing Subversion repository will produce a ~0.8 GB Git > repository which every user will have on his/her machine because of > the decentralized architecture of Git. I wonder whether this is really > the best way to proceed. The alternative would be to keep the > existing, big repository only as a legacy backup, but make a fresh > start with Git with the current version of SICOPOLIS. The problem with > the latter option is that it will not include the active branches > maintained by some of you, so you would have to merge them in manually > if they are supposed to be in the new Git repository. > > Please let me know what you think. And, of course, if anything is > unclear, let me know likewise. > > Apologies for the inconvenience! > > Best regards, > > Ralf Greve > -- -_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_- Dr. Reinhard Calov Potsdam Institute for Climate Impact Research PO Box 60 12 03 D-14412 Potsdam Germany Phone: ++49/331/288-2595 E-mail: calov at pik-potsdam.de Web: http://www.pik-potsdam.de/members/calov/ _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ From greve at lowtem.hokudai.ac.jp Thu Jun 25 10:43:23 2020 From: greve at lowtem.hokudai.ac.jp (Ralf Greve) Date: Thu, 25 Jun 2020 17:43:23 +0900 Subject: [SICOPOLIS:85] Update: SICOPOLIS goes Git Message-ID: Dear colleagues, thanks a lot for your feedback and many good tips about the change from Subversion to Git. Highly appreciated! There will be a fresh start with a Git repository starting from the tagged version 5.1, to be hosted at the Alfred Wegener Institute's GitLab system . It will not contain all the input data files (DEMs etc.) any more, which will keep the new repository nicely lightweight. In addition, the current Subversion repository will be converted to a "legacy" Git repo. Things are already underway. The current Subversion repository is still accessible. However, please consider it as frozen and don't commit any new code to it any more. Best regards, Ralf Greve -- Dr. Ralf Greve Professor, Glacier and Ice Sheet Research Institute of Low Temperature Science (ILTS) Hokkaido University Kita-19, Nishi-8, Kita-ku Sapporo 060-0819, Japan (+81)-(0)11-706-6891 greve at lowtem.hokudai.ac.jp http://wwwice.lowtem.hokudai.ac.jp/~greve/ https://twitter.com/ralfgreve ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ From greve at lowtem.hokudai.ac.jp Thu Jun 25 10:52:05 2020 From: greve at lowtem.hokudai.ac.jp (Ralf Greve) Date: Thu, 25 Jun 2020 17:52:05 +0900 Subject: [SICOPOLIS:86] Update: SICOPOLIS goes Git Message-ID: Sorry, the previous mail went out prematurely. I messed up "save" and "send"... Just wanted to add that I'll keep you posted about the progress, of course. Best regards, Ralf Greve -- Dr. Ralf Greve Professor, Glacier and Ice Sheet Research Institute of Low Temperature Science (ILTS) Hokkaido University Kita-19, Nishi-8, Kita-ku Sapporo 060-0819, Japan (+81)-(0)11-706-6891 greve at lowtem.hokudai.ac.jp http://wwwice.lowtem.hokudai.ac.jp/~greve/ https://twitter.com/ralfgreve ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++