Jacob Kaplan-Moss

9 items tagged “scm”

📌 Confessions of a Git Skeptic | Art & Logic Blog

My conclusion is different — I’m sticking to Git — but this sums up my feelings about Git quite well. It’s a tool I don’t mind using (and do use every day), but it’s not a tool I particularly love. #

📌 RubyForge: git-trac

Nice integration between git, git-svn, and Trac. Stupidly relies on scraping HTML instead of Trac’s XML-RPC interface, but otherwise pretty damn nice. #

📌 Piston ~ Easy Vendor Branch Management

Like svn:externals, but managed internally. An interesting idea -- I’ll have to give it a try. #

📌 Changes Beta

An interesting visual diff tool along the lines of FileMerge or kdiff3. I’ve been more than happy with FileMerge, but Changes is probably worth a look. #

📌 Piston ~ Easy Vendor Branch Management

“Piston is a utility that eases vendor branch management. This is similar to svn:externals, except you have a local copy of the files, which you can modify at will. As long as the changes are mergeable, you should have no problems.” Nifty. #

📌 ForestExtension - Mercurial

Looks like this might be a satisfactory replacement for svn:externals. #

📌 [PATCH] http auth user & password lookup

A patch against mercurial to allow storage of http credentials in hgrc. I can’t belive that mercurial doesn’t correctly cache http auth info; it’s a seriously annoying wart. #

📌 Distributed source control > Matt's geeky shirts | CafePress

An inside joke here at work. #

📌 Svnmerge.py - SubversionWiki

Part of SVN 1.4, this looks like a *much* more sane way of handling branches. Must investigate further... #