You’re hacking on your local working copy and you want to keep it up-to-date but, since you have some uncommitted changes, git-svn rebase cannot be executed

I was just thinking to write something about this problem when I read a post on digikam blog.

In this post Marcel proposes a workaround using a bash function. In fact there’s a “cleaner” solution, if you’re interested read the last part of my git-svn howto.

This is a really small howto that describes how to work on a project versioned with svn (maybe taken from KDE repository ) using git.

What’re the advantages?

Since Git is a distributed revision control system (while svn is a centralized one) you can perform commits, brances, merges,… on your local working dir without being connected to internet.

Next time you’ll be online, you will be able to “push” your changes back to the central svn server.

Steps to follow:

You’ve to:

1. install git and git-svn
2. create the working dir: mkdir strigi
3. init your git working dir:
   cd strigi && git-svn init https://svn.kde.org/home/kde/trunk/kdesupport/strigi
   git-svn init command is followed by the address of the svn repository (in this case we point to strigi’s repository)
4. Find a commit regarding the project (you can get it from cia version control). Warning: the command git-log will show project’s history starting from this revision.
5. Perform the command git-svn fetch -rREVISION
   Where REVISION is the number obtained before.
6. Update your working dir: git-svn rebase

Now you’ll be able to work on your project using git as revision control system.

To keep update your working copy just perform:

git-svn rebase

You can commit your changes to the svn server using the command:

git-svn dcommit

In this way each commit made with git will be “transformed” into a svn one.

Solve git-svn rebase problems

While adding new cool features to your program, you may experiment some problem when synchronizing with the main development tree. In fact you have to commit all local modifications (using the git-commit command) before invoking git-svn rebase.

Sometimes it isn’t reasonable since your changes are not yet ready to be committed (you haven’t finished/tested/improved your work). But don’t worry, git has a native solution also for this problem, just follow these steps:

1. put aside your changes using the command: git-stash
2. update your working copy using: git-svn rebase as usual
3. take back your changes typing: git-stash apply
4. clear “the stash” typing: git-stash clear

After the first step all your uncommitted changes will disappear from the working copy, so you’ll be able to perform the rebase command without problems.

For further informations read git-stash man page.

That’s all.

Greetings: I would like to thank Thiago Macieira for his help.

Target

have the following keymap:
apple keyboard = alt gr

Instructions

You’ve to edit your /etc/X11/xkb/keycodes/xfree86 file. Remember to make a backup copy of this file before editing.
These’re the easy steps:

• under X run a program like xev to find the exact keycode of your apple key
• change the code with the new one
• comment all the old command referring the new keycode

Restart X and keep your finger crossed

Configuration file

Here’s my xfree86 file, you can try it if you’ve an iBook with an italian keyboard

Target

We just want this mapping:

apple key = alt gr
numpad return (the key near to left arrow) = canc

Procedure

Simply download the file at the end of the page and load it using
loadkeys ibook-it.map.gz

Simple, isn’t it?

Download

I found this file over internet, the author is Dario Besseghini. Thank you Dario!
iBook console keyboard mapping

Target:

I just wanted to enable mouse button emulation on my iBook using the following shortcuts:

fn + ctrl = middle mouse button
fn + alt = left mouse button

Requisites:

You’ve to enable CONFIG_MAC_EMUMOUSEBTN in your kernel.

Commands:

In order to enable this shortcut at every boot add the following lines to your /etc/sysctl.conf:

dev.mac_hid.mouse_button_emulation = 1
dev.mac_hid.mouse_button2_keycode = 97
dev.mac_hid.mouse_button3_keycode = 100

Simple, isn’t it?

Pattern matching

In this example you’ll find how you can match a regexp in a string.

// Created by Flavio Castelli <flavio.castelli_AT_gmail.com>
// distrubuted under GPL v2 license

#include <boost/regex.hpp>
#include <string>

int main()
{
	boost::regex pattern ("bg|olug",boost::regex_constants::icase|boost::regex_constants::perl);
	std::string stringa ("Searching for BsLug");

	if (boost::regex_search (stringa, pattern, boost::regex_constants::format_perl))
		printf ("found\n");
	else
		printf("not found\n");
		
	return 0;
}

Substitutions

In this example you’ll find how you can replace a string matching a pattern.

// Created by Flavio Castelli <flavio.castelli@gmail.com>
// distrubuted under GPL v2 license

#include <boost/regex.hpp>
#include <string>

int main()
{
	boost::regex pattern ("b.lug",boost::regex_constants::icase|boost::regex_constants::perl);
	std::string stringa ("Searching for bolug");
	std::string replace ("BgLug");
	std::string newString;

	newString = boost::regex_replace (stringa, pattern, replace);

	printf("The new string is: |%s|\n",newString.c_str());
		
	return 0;
}

Split

In this example you’ll find how you tokenize a string with a pattern.

// Created by Flavio Castelli <flavio.castelli@gmail.com>
// distrubuted under GPL v2 license

#include <boost/regex.hpp>
#include <string>

int main()
{
	boost::regex pattern ("\\D",boost::regex_constants::icase|boost::regex_constants::perl);
	
	std::string stringa ("26/11/2005 17:30");
	std::string temp;
	
	boost::sregex_token_iterator i(stringa.begin(), stringa.end(), pattern, -1);
	boost::sregex_token_iterator j;

	unsigned int counter = 0;
	
	while(i != j)
	{
		temp = *i;
		printf ("token %i = |%s|\n", ++counter, temp.c_str());
		i++;
	}

	return 0;
}

Requirements

In order to build this examples you’ll need:

• a c++ compiler (like g++)
• boost regexp library