Home

Welcome to the ogs5-trunk wiki!

Connect your Git repository to Subversion (original post)

The following steps are required to synchronize the SVN and git repositories.

$ mkdir sources
$ cd sources
$ git clone git@github.com:envinf/ogs5-trunk.git
$ git svn init https://svn.ufz.de/svn/ogs/trunk/sources 
$ git config svn.authorsfile ../authors.txt
$ git update-ref refs/remotes/git-svn refs/remotes/origin/master
$ git svn rebase

Now you can sync the current branch (use always the master branch!) to Subversion with git svn dcommit (you may also want to append --dry-run to the command to see what gets synced before you actually sync).

To sync changes from Subversion to Git use git svn rebase.

Commit to SVN repository

It's recommended to push git commits to a SVN repository from a release or develop branch rather than from master as below. This way makes SVN keep commit tree simple (dcommit always changes SHA of the last commit by adding SVN rev.) and store all git commits separately (see here).

$ git checkout my_branch
.....working....
$ git svn rebase
$ git svn dcommit
$ git checkout master
$ git svn rebase
$ git branch -d my_branch

Authors file

Authors file is needed to map commit author names between SVN and git repositories (see here). The following is my ad-hoc list of all the possible authors (some are clearly not authors). Copy and save the following list in authors.txt

hw = Holger Weiss <holger.weiss@ufz.de>
soswald = Sascha Oswald <sascha.oswald@ufz.de>
kalbus = Edda Kalbus <edda.kalbus@ufz.de>
zehner = Bjoern Zehner <bjoern.zehner@ufz.de>
tschnick = Thomas Schnicke <thomas.schnicke@ufz.de>
fhesse = Falk Hesse <falk.hesse@ufz.de>
dkahlenb = Daniel Kahlenberg <daniel.kahlenberg@ufz.de>
okolditz = Olaf Kolditz <olaf.kolditz@ufz.de>
wwang = Wenqinq Wang <wenqinq.wang@ufz.de>
Wenqing Wang = Wenqinq Wang <wenqinq.wang@ufz.de>
haibing = Habing Shao <haibing.shao@ufz.de>
pechstei = Armin Pechstein <armin.pechstein@ufz.de>
raduflor = Florian Adrian Radu <florian.radu@ufz.de>
centlerf = Florian Centler <florian.centler@ufz.de>
watanabe = Norihiro Watanabe <norihiro.watanabe@ufz.de>
delfs = Jens-Olaf Delfs <jens-olaf.delfs@ufz.de>
bilke = Lars Bilke <lars.bilke@ufz.de>
fengs = Feng Sun <feng.sun@ufz.de>
FENGS = Feng Sun <feng.sun@ufz.de>
goerke = Uwe Jens Goerke <uwe-jens.goerke@ufz.de>
wuya = Yajie Wu <yajie.wu@ufz.de>
graebe = Agnes Graebe <agnes.graebe@ufz.de>
kalbache = Thomas Kalbacher <thomas.kalbacher@ufz.de>
singha = Ashok Kumar Singh <ashok.singh@ufz.de>
muelleth = Thomas Mueller <thomas.mueller@ufz.de>
marxa = Andreas Marx <andreas.marx@ufz.de>
rinkk = Karsten Rink <karsten.rink@ufz.de>
taron = Joshua Taron <joshua.taron@ufz.de>
sun = Yuanyuan Sun <yuanyuan.sun@ufz.de>
fischeth = Thomas Fischer <thomas.fischer@ufz.de>
zech = Alraune Zech <alraune.zech@ufz.de>
trauth = Nico Trauth <nico.trauth@ufz.de>
dinizcon = Tatiana Diniz Goncalves <tatidg@ufz.de>
lankenau = Lena Lankenau <lena.lankenau@ufz.de>
lavergne = Remi Lavergne <remi.lavergne@ufz.de>
frenkel = Marcus Frenkel <marcus.frenkel@ufz.de>
selle = Benny Selle <benny.selle@ufz.de>
extjulia = Julia Grunwald <julia-dd1@gmx.de>
extmcder = Prof. Christopher McDermott <cmcdermo@staffmail.ed.ac.uk>
exteichh = Eila Eichhorn <eichhorn.eila@gmx.de>
extboett = Norbert Boettcher <norbert.boettcher@tu-dresden.de>
extidiar = Andres Idiart <andres.idiart@oxand.com>
# extwalth = Marc Walther <>
extmauro = Mauro Cacace <cacace@gfz-potsdam.de>
extxie = Mingliang Xie <xie@grs.de>
extcheru = Yvonne Cherubini <yvonne.cherubini@gfz-potsdam.de>
extmarco = Marco de Lucia <delucia@gfz-potsdam.de>
extbloec = Guido Bloecher <bloech@gfz-potsdam.de>
extkempk = Thomas Kempka <kempka@gfz-potsdam.de>
exthokr = Milan Hokr <milan.hokr@tul.cz>
extfranc = Joachim Francke <j.francke@gmx.net>
extwu = Wenjie Xu <wenjie.xu@bgr.de>
extnowak = Thomas Nowak <thomas.nowak@bgr.de>
extyoon = Jeoung Seok Yoon <jeoungseok.yoon@efzn.de>
extkunz = Herbert Kunz <herbert.kunz@bgr.de>
extshao = Hua Shao <shao@bgr.de>
exttian = Hong Tian <tian@geotechnik.rwth-aachen.de>
extratei = Matthias Rateitzak <matthias.rateitzak@bgr.de>
extstadl = Susanne Stadler <susanne.stadler@bgr.de>
extnakar = Kenichiro Nakarai <nakarai@ce.gunma-u.ac.jp>
extkosak = Georg Kosakowski <georg.kosakowski@psi.ch>
exthayek = Mohamed Hayek <mohamed.hayek@psi.ch>
extroewe = Oliver Roewer <oliver.roewer@uni-rostock.de>
extbauer = Sebastian Bauer <sebastian.bauer@gpi.uni-kiel.de>
extli = Dedong Li <dedong.li@gpi.uni-kiel.de>
extkunth = Wolfgang Kunther <wolfgang.kunther@empa.ch>
extgraup = Bastian Graupner <bastian.graupner@gpi.uni-kiel.de>
extfahrn = Sven Fahrner <fahrner@gpi.uni-kiel.de>
extbeyec = Christof Beyer <cb@gpi.uni-kiel.de>
extlee = Youngsoo Lee <naru@hanyang.ac.kr>
extneset = Kamil Nesetril <kamil.nesetril@tul.cz>
extpicho = Geraldine Pichot <geraldine.pichot@univ-rennes1.fr>
exthou = Michael Hou <hou@tu-clausthal.de>
extbecht = Michel Bechtold <m.bechtold@fz-juelich.de>
# extganze = Leohard Ganzer <>
# extgraf = Thomas Graf <>
extjang = Wonyong Jang <wyjang@gatech.edu>
# extruten = Michael Rutenberg <>
extecker = Dominik Eckert <dominik.eckert@student.uni-tuebingen.de>
# exthornb = Goetz Hornbruch <>
extaltep = Peter Alt-Epping <alt-epping@geo.unibe.ch>
extengli = Myles English <myles.english@ed.ac.uk>
exthamid = Nick Hamid <nick@geo.uu.nl>
# extseide = Martin Seidel <>
extkrug = Stefanie Krug <stefanie.krug@bgr.de>
extnowat = Thomas Nowak <thomas.nowak@bgr.de>
# extdursi = Jonathan Dursi <>
# extdevri = Luis Manuel de Vries <>
extwuy = Yajie Wu <yajie.wu@ufz.de>
# extsoehl = Dennis Soehl <>
extkoldi = Bastian Kolditz <Bastian.kvfg@web.de>
extschaa = Annika Schaefers <annika.schaefers@bgr.de>
extpark = Chan-Hee Park <chanhee.park@ufz.de>
# extlippm = Johanna Lippmann-Pipke <>
# extichik = Prof. Yasuaki Ichikawa <>
Lars Bilke = Lars Bilke <lars.bilke@ufz.de>
Thomas Fischer = Thomas Fischer <thomas.fischer@ufz.de>
Haibing Shao = Haibing Shao <haibing.shao@ufz.de>
Thomas Kalbacher = Thomas Kalbacher <thomas.kalbacher@ufz.de>
Olaf Kolditz = Olaf Kolditz <olaf.kolditz@ufz.de>
Dr. Olaf Kolditz = Olaf Kolditz <olaf.kolditz@ufz.de>
Karsten Rink = Karsten Rink <karsten.rink@ufz.de>
Norihiro Watanabe = Norihiro Watanabe <norihiro.watanabe@ufz.de>
(no author) = no_author <no_author@no_author>
Yanliang Du = Yanliang Du <unknown@email>
Matthias Hess = Matthias Hess <unknown@email>
Martin Beinhorn = Martin Beinhorn <unknown@email>
Cui Chen = Cui Chen <unknown@email>
Chan-Hee Park = Chan-Hee Park <unknown@email>
park = Chan-Hee Park <unknown@email>
Mingliang Xie = Mingliang Xie <unknown@email>
Chris McDermott = Chris McDermott <unknown@email>
Georg Kosakowski = Georg Kosakowski <unknown@email>
Panagiotis Adamidis = Panagiotis Adamidis <unknown@email>
Jan Gronewold = Jan Gronewold <unknown@email>
Robert Walsh = Robert Walsh <unknown@email>
Sebastian Bauer = Sebastian Bauer <unknown@email>
Jens-Olaf Delfs = Jens-Olaf Delfs <unknown@email>
Norbert Boettcher = Norbert Boettcher <norbert.boettcher@ufz.de>
Magdalena Kempa = Magdalena Kempa <unknown@email>
Myles English = Myles English <unknown@email>
Ashok Kumar Singh = Ashok Kumar Singh <unknown@email> 
Ashok Singh = Ashok Kumar Singh <unknown@email> 
Feng Sun = Feng Sun <unknown@email>
Yajie Wu = Yajie Wu <unknown@email>
Marco De Lucia = Marco De Lucia <unknown@email>
Hong Tian = Hong Tian <unknown@email>
Uwe-Jens Goerke = Uwe-Jens Goerke <uwe-jens.goerke@ufz.de>
Remi Lavergne = Remi Lavergne <unknown@email>
Joshua Taron = Joshua Taron <unknown@email>
nagelt = Thomas Nagel <thomas.nagel@ufz.de>
waltherm = Marc Walther <marc.walther@ufz.de>
boettche = Norbert Boettcher <norbert.boettcher@ufz.de> 
extpfeif = Unknown <unknown@email>
extmassm = Unknown <unknown@email>