Version Control Blog

Christian Neukirchen describes a useful procedure for how to set up tracking of foreign CVS repository using Git, cvsup and cvsps 2.1. He uses the Ruby CVS repository as an example. The resulting GIT repository takes 29 megabytes and contains entire Ruby development history for eight years. Read more at Tracking the Ruby CVS with Git. P.S.: I had to install newer cvsps, and to edit the CVSROOT/config file, removing LockDir config option. Give git-cvsimport a -v flag to see what it is doing.

From: “Petr Baudis” <pasky+suse.cz>

Date: Fri, 29 Sep 2006 14:06:39 +0200

Hello,

I just released cogito-0.18 - new feature release of the Cogito user-friendly Git user interface. The biggest highlights are super-duper cg-log, tagging interface and cg-patch -m. Contrary to my plan, this unfortunately does NOT contain three big things yet that are missing but will be in cogito-0.19 (which should be already quite near the ever-approaching version 1.0):

• - Rigorous three-way merging of uncommitted local changes instead of stashing local changes in patches (stashing produces harder-to-resolve conflicts and can in some extreme circumstances lead to loss or almost-loss of your local changes which is highly evil; this is my priority now; if you want to be absolutely safe, do not update/merge/switch your tree while having uncommitted changes in it)
• - Support for cg-clone -a (clone all remote branches)
• - Support for auto-pushing tags

So, now for things that ARE part of 0.18: :-)

First, a simple README update is the only difference from 0.18rc2.

* INCOMPATIBLE: $COGITO_COLORS is renamed to $CG_COLORS * INCOMPATIBLE: cg-log now by default hides merges, -M behaviour is reversed * All kinds of very stale command aliases that were deprecated for eons were removed * .git/author is deprecated (use .git/config to set it up) * We now officially depend on 1.4.2 (we use git-*-fetch –stdin which makes fetching tags _MUCH_ faster) * cg-log was reworked to support cg-log -d (show diffs inline), cg-log -S (pickaxe) and renames following (does not quite work, though; I decided not to fix it and wait for revisions.c in Git to support it since the perl script which takes care of this is quite a hack) * cg-switch -l to stash your local changes when switching branches * cg-commit –amend * Tagging interface (cg-tag, cg-tag-ls, cg-tag-show) was greatly enhanced * cg-patch -m for applying mailboxes * cg-clone -l now sets up an alternate instead of symlinking the object db * Support for cg-clone –reference * cg-admin-setuprepo supports setting up repositories over SSH * Support fetching over FTP * Other cool stuff! Happy hacking, – Petr “Pasky” Baudis

From: “Marco Costalba” <mcostalba@gmail.com>

Date: Sat, 30 Sep 2006 08:30:03 +0200

This is mostly a bug fix release.

Fixes are all over the place but most important are the fixes to code range filtering.

Code range filtering is when you select some text in file viewer and want to view the list of revisions that modified that code range.

Download tarball from http://www.sourceforge.net/projects/qgit or directly from git public repository git://git.kernel.org/pub/scm/qgit/qgit.git

Please refer to http://digilander.libero.it/mcostalba/ for additional information.

Marco

ChangeLog from 1.5.1

• - fix a memory leak in case annotation is closed while processing
• - fix a rare segfault due to a race in annotation code
• - fix commit when the change in working dir is a file deletion
• - fix file list is not cleared when changing to revision with no files
• - load file history without –topo-order option
• - fix bold file content after removing range filter
• - fix range filter miscalculation
• - fixed two bugs in range filter code
• - fix file view font to match main view one
• - fix date/time column title issues
• - fix a very rare hang on exit
• - refactor exceptions handling code

From: “Junio C Hamano” <junkio+cox.net>

Date: Fri, 29 Sep 2006 23:53:41 -0700

The latest maintenance release GIT 1.4.2.3 is available at the usual places:

http://www.kernel.org/pub/software/scm/git/

Sorry to be doing two maintenance releases in rapid succession, but git-mv breakage causes random tree corruption and is rather serious.