thinking in geek tagline’s are so web2.0

google
yahoo
bing

Posts Tagged scm

Speeding up git svn on Windows (win32)

Update: This fix is now included in git releases 1.7.0.1 and greater – for more info – click here.
Some people have noticed that using git svn (in my case msysgit) on Windows VM’s1 can be incredibly slow. I’m one of those people.
Running a no-op rebase (i.e. there are no changes @ the [...]


SVN 1.5

Well – (finally) Subversion 1.5 is out! 
For the first time svn has built in support for repeated merges without spurious conflicts or manually managing the list of previously merged revisions.
This is _fantastic_ news. The basis of the merge tracking feature in 1.5 was svnmerge.py which means that many svn users will already have a reasonable idea [...]


Posted
6 August 2007 @ 6pm

Tagged
scm

On merging (svnmerge.py)

This subject has come up a few times in the last few days – I thought I’d take the opportunity to collect my thoughts from various emails and put them here.
Svnmerge.py is a tool which tries to fix the _totally broken_ “svn merge” command.  Here’s an example scenario. My repository contains a number of branches [...]


Git

I managed to find some time to watch this today: Tech Talk: Linus Torvalds on git
Git is a distributed SCM system – Linus wrote it in two weeks. It seems like it’s getting some traction among some of the Rails crowd. Mozilla seriously considered adopting it for Mozilla 2 work but the lack of a [...]