Scm

In case you find yourself in need of a way to turn an svn revision into a git patch that can be applied with ‘git am’, keeping the commit message and authorship information, here’s a script I used recently: #!/usr/bin/python # # svnrev2git.py - Convert an SVN revsion to a Git patch. # # Author: James Bowes <jbowes@repl.ca> # # Usage: # $> cd my-svn-repo # $> python svnrev2git.py [AUTHORS_FILE] [REV_RANGE | REVSION [REVISION..]] # # AUTHORS_FILE - a CSV of svn username, full name, email # REV_RANGE - an svn revision range, like 100-700 # REVISION - a single svn revision # # You may specify either a revision range, or a series of individual # svn revisions # # Output: # A series of git style patch files, one per svn revision, which can then be # applied with 'git am' # # Why use this instead of 'git svn'? »

Here’s a quick little script I wrote up (adapted from this perlmonks post) to show git repository activity as an ascii graph, like so: The X axis represents a day, with the current day being on the far right. The Y axis is no. of lines added + no. of lines deleted during that day. EDIT (2009/02/03): Wordpress.com won’t let me attach a .pl file, so here’s the contents: #!/usr/bin/perl # # git-graph.pl - Generate an ascii graph of git repository activity # # Copyright (C) 2008 James Bowes <jbowes@dangerouslyinc.com> # # Graphing routine Adapted from http://www.perlmonks.org/?node_id=336907 sub get_activity { my $day = shift; my $git_cmd = 'git diff --shortstat "@{' . »

< mdehaan> atomic commits are dangerous, just as atomic weapons He may have been sarcastic. Maybe. »

I used git bisect to track down a bug in yum last night. It was so easy and practical that I figured I should record it here, so that others might want to give git a try. I was attempting to install mutt, and yum failed (printing a traceback) after the rpms had been downloaded, but before the test transaction finished. So I started git bisect, and marked the current point as bad: $> git bisect start $> git bisect bad The yum 3.1.0 release didn’t have this bug (it was the version I had installed at the time), so I marked it as good: $> git bisect good yum-3-1-0 Bisecting: 15 revisions left to test after this [1d0454af41ef6361604cafa8c7a13d80bc183c63] make it so that we see that the local rpm is present and then don't download Git automatically checks out the next revision for you to test. »

$> svn co svn://gcc.gnu.org/svn/gcc/trunk gcc $> cd gcc $> du -h ... 1.6G . $> svn export . ../clean-gcc $> cd ../clean-gcc $> du -h ... 638M . $> Oh, yes, I did. »

Where possible, I use git for my scm now. All software on dangerously incompetent is stored in git, and I do my personal yum work with git-cvsimport. One of the reasons I like git so much is git- rebase. Here’s an example of how it works: There is some upstream project that you wish to work on. You clone this upstream project when it is in state A, and make some changes. »

**Update: **I’ve posted a revised version of my .gitconfig here. By default, git does not include aliases for commands. For instance, ‘git status’ works but ‘git st’ does not. This will hurt your noggin if you are used to using cvs or svn. Also, the internet is for posting config files on. So here are the contents of my .gitconfig: [user] name = James Bowes email = MY_EMAIL [alias] ci = commit -a co = checkout st = status -a praise = blame [apply] whitespace = strip [diff] color = auto rename = copy [pager] color = true [status] color = auto Just drop that into ~/.gitconfig and you’re all set. »