Comments on: Trying out Git

By: Remko Tronçon

Remko Tronçon — Tue, 21 Oct 2008 05:03:26 +0000

@Murz: In my post, there are links to both GitHub and a temporary web-interface. The ‘commits’ sections of both contain a live changelog. The temporary web-interface will move to dev.psi-im.org as well, but we haven’t had time to do that yet.

By: Murz

Murz — Mon, 20 Oct 2008 19:12:33 +0000

Where I can look the live changelog for git repo like the svn one at url http://dev.psi-im.org/websvn/log.php?repname=Psi ?

By: Remko Tronçon

Remko Tronçon — Fri, 26 Sep 2008 23:58:58 +0000

@Aleksi: Actually, I couldn’t find an easy way to do it. Keep in mind that several people are committing to Git, and that the authors need to be maintained in subversion. The git-svn approach only works for one committer in the Git repo AFAIK.

By: AlekSi

AlekSi — Fri, 26 Sep 2008 19:38:02 +0000

Remko, actually to sync master branch with svn trunk and make svn read-only is easy.
My new repo is fork of psi-im/master now. Thanks for git.

By: Remko Tronçon

Remko Tronçon — Sat, 20 Sep 2008 14:30:26 +0000

@AlekSi: Unfortunately, no, we’re not going to sync svn. The reason is that it is very hard to do an automatic sync of an svn with a real Git repo. I know it’s annoying for you GSoC students, but you can ask mblsha how he converted his Git repo to the official one. In the worst case, you can do a git diff && git apply, at the cost of change history. Sorry for that.

By: AlekSi

AlekSi — Sat, 20 Sep 2008 08:50:50 +0000

Remko, are you going to sync SVN repository with Git? I just want to mention that our GSoC projects are forks of mblsha/psi, which is in turn mirror of SVN. It is impossible to create a fork of psi-im/psi without removing existing repo.

By: kael

kael — Sun, 31 Aug 2008 18:46:59 +0000

@Remko

Actually, I’m not yet able to patch Psi. I was referring to running SVN versions, though. I’ll remove completely the SVN version and compile a new Git one. Thanks.

By: Remko Tronçon

Remko Tronçon — Sun, 31 Aug 2008 15:30:38 +0000

@kael I’m not sure I understand what you mean. There is no way to transition from SVN to Git. You should remove your SVN working copy, and clone a Git repository, and start from scratch. If you had pending changes, you should ’svn diff’ before removing the working copy, and apply the patch to your Git clone.

By: kael

kael — Sun, 31 Aug 2008 15:15:45 +0000

How to make the transition between the SVN and Git dev ?

Should a make distclean be run in the SVN …/psi folder first and then git clone run on the parent folder ?

By: Jason

Jason — Thu, 28 Aug 2008 22:56:32 +0000

I must not go to GitHub enough any more. I know they’ve been through a bumpy road, but lately it’s worked pretty nicely for me.

Ah well. Having a secondary is not a bad idea, I was just generally curious.