Trying out Git

2008-08-26T00:00:00+02:00

A while ago, the Psi development team switched from Darcs to Subversion for version control, because the Darcs pros (distributed, extremely simple and elegant) did not compensate for the cons any longer (slowness, non-scalability, ‘infinite’ merges, lack of community and tools, …). Our development was pretty central anyway at that time, so we decided that Subversion was good enough. However, we started to miss local commits more than we thought we would, and some of us are working on their own forks, which makes Subversion a suboptimal choice. We are therefore currently trying out Git as a replacement, which should bring us all the good stuff from Darcs, combined with the speed and portability of Subversion. Note that during the experiment, we will not be updating our Subversion branch any more (which will soon cause breakage, since Subversion automatically updates changes to the external Iris repository).

If you’re interested in following our latest developments from our experimental Git tree, simply clone our official repository through the following steps:

git clone git://git.psi-im.org/psi.git
cd psi
git submodule init
git submodule update

To get the latest changes after an initial clone, execute the following commands

git pull
git submodule update

Note that you need Git 1.5 or later in order to be able to do these commands.

If you’re interested in knowing more about using Git, check out Scott Chacon’s excellent Git talk (and accompanying book).

For fans of social networking, we also have a mirror of the official Psi repository on GitHub. And while we’re on the topic of web interfaces: while waiting for an official web interface to our Git repository, you can check out an experimental one here.

Psi Subversion repository

2006-11-08T00:00:00+01:00

As many of you know, Psi has been using Darcs for version controlling since the development of 0.10. However, although Darcs works on most platforms, some people have been experiencing problems with getting Darcs to work for them. Because of this, and some other inconveniences (not being able to checkout subdirectories of the development tree, long checkout times, the lack of a scalable web-interface, …), we have decided to create a Subversion mirror our development repository (using Tailor).

A mirror of our mainline development branch is available at http://svn.psi-im.org/psi/trunk. The complete repository can be browsed though the web-interface.

We strongly recommend all users to use the Subversion repository instead of the Darcs repository. This goes for our contributors as well: instead of sending in Darcs bundles, you may (nay, SHOULD) now send in unified diffs (from svn diff) to our patches mailinglist.

El Tramo | Darcs

Trying out Git

Psi Subversion repository