This is a small guide I wrote for my own convenience when I recently was converting an SVN repository to a Git repository. I’ve published it here so that I can easily look up the things I need to remember..

I’ve found most of these examples in the excellent official git-svn documentation.

git remote add <remote-name> <remote-url>

Note that the git-svn documentation has a section discussing rebase vs pull/merge:

Prefer to use git svn rebase or git rebase, rather than git pull or git merge to synchronize unintegrated commits with a git svn branch. Doing so will keep the history of unintegrated commits linear with respect to the upstream SVN repository and allow the use of the preferred git svn dcommit subcommand to push unintegrated commits back into SVN.

git add <file>
git commit -m "<commit message>"
git svn dcommit # This will push your changes to the SVN repository

git diff git-svn HEAD # Assuming your remote SVN branch is called git-svn

http://stackoverflow.com/a/9776318/1094451

http://stackoverflow.com/a/6040113/1094451

Basic usage of git-svn

This is something I don’t do that often, and I always forget the correct syntax. Thus this post.

Let’s say you have a table images and a table users. Now you want to delete all rows in table images that are associated with rows in the table users that are marked as deleted.

First, I usually do a visual inspection of the rows that will be deleted:

SELECT i.* FROM images i LEFT JOIN users u ON i.user_id = u.id WHERE u.deleted = 1;

The rows returned by this query are the rows that will be deleted when you run the following query:

DELETE i FROM images i LEFT JOIN users u ON i.user_id = u.id WHERE u.deleted = 1;

They key part here is to specify which table you want to delete from. In this case it’s the table i, which is the images table.

Deleting rows with a LEFT JOIN in MySQL

Disabling the password needed for sudo for a specific user is very easy in Ubuntu. This method applies to Ubuntu 16.04, but probably also other versions of Ubuntu and maybe even other distros.

Note: If this is the first time you’re running this command, you’ll most likely be presented with a list of editors to choose from. Choose the one you’re most comfortable with.

Then enter the following line at the end of the file:

Make sure to replace user with the username of the user you want to allow using sudo without entering a password.

Disabling password for sudo in Ubuntu

The Royal Norwegian Air Force practices formation flying every year in December. This year, they were schedule to fly over Bodø at 11:22 on December 8th. I managed to capture them with my zoom lens just a couple minutes after their scheduled arrival.

It wasn't the greatest light for photographing moving aircrafts, but I managed to get a couple of photos that turned out somewhat okay.

RNoAF Christmas Star 2022

I relatively recently posted about moving my website to WordPress. This actually still holds true, but I’ve given the website a new look and made some changes to the deployment routines.

Now I have a solid development focused foundation based on Trellis.

My website is my playground. This is where I can freely play with any new technologies that I come across and just have some fun. It’s important to me that some of the things I do on the computer is just for fun, and not only work related – there’s quite a lot of that.

My previous WordPress setup was just a Digital Ocean droplet created using their One-Click WordPress installation. This works fine if you just want a website up and running where you can add a theme and your favorite plugins and start typing. But it gets a bit trickier when you want to have a local development version of the site on your computer and a production version, and even maybe a staging version, running live on the internet.

This is where Trellis comes into play. It’s a ready-to-use setup based on Bedrock and Ansible and lots of other good stuff that makes it really simple to get up and running with three different environments:

The workflow for setting up a new site once you have Trellis installed is something along the lines of:

Do some small adjustments to a couple of configuration files for the hosts (servers) and the various environments

Create a git repository of your project and push it to ie. Github

And voilà! Your site is now deployed to the staging server. Of course, you must have set up a server somewhere to use as a staging server. The same goes for the production environment.

In addition to this, I use the WP DB Migrate Pro plugin(s) so that I can easily migrate my database and media files from one environment to another.

Website changes – again

I'm Kim, a full-stack web developer and entrepreneur based in Bodø, Norway. Currently occupied with running my own company, being a father and raising a little standard poodle.

Full-stack web developer, business owner and tech geek.

Basic usage of git-svn

Cloning the SVN repository

Adding another remote

Fetching and rebasing changes from SVN

Doing work and pushing to SVN

Pushing to other remotes

See what will be pushed to SVN