mikkeman.nl

This post is for people running a private Samba server, wishing it was securely accessible over the Internet. Stop reading if you don’t know what Samba or SSH means.

Imagine the following situation: at work, school or a client site, you insert your USB stick, check your local hard drive and search your Gmail account to find out that the one file you were looking for is not there. You probably left it at home. Damn!

Sounds familiar? It does happen to me frequently.

A solution is to have access over the Internet to your private Samba server. No more worrying that you didn’t take a particular file with you, just access it from anywhere you like. But you also want that access to be secure. Can it be done? Yes.

What do you need?

• A server running Samba that also provides SSH access from the internet
• Windows XP on the client
• PuTTY on the client

read more »

My usual day doesn’t involve a lot of technical stuff, but once in a while I happen to enjoy an evening with editors and revision control systems. Once in a while is not often enough to memorize all tips and tricks about branching, tagging, merging and working copies.

I used to use the TortoiseSVN -> Merge dialog for merging changes from trunk to a branch. I find this dialog quite… confusing. What source? What revisions? Yesterday evening I found an easier solution for this. I decided to put it up here, I’m sure I’ll need it again someday. And perhaps there are some people out there that might find this helpful as well.

I assume an up-to-date working copy, all changes committed, no conflicts with the repository.

Right click trunk, pick TortoiseSVN -> Show log. Select the revision(s) you want to merge, right click and choose Merge. Pick a folder in your working copy to merge to, click OK, and presto, done.

Piece of cake. Do Not Forget This Anymore.