Tag Archives: subversion

Syncing a Local Git-Less Subversion Working Copy with a Remote Git Repository

By michael | Published: 24 Aug 2010

Checkin all your local modifications to svn: svn ci -m “message” . Setup git for your local working copy: git init . Sync your local working copy with the remote git repository: git remote add origin git@github.com:username/project.git git pull origin master Revert your local working copy to your most recent svn checkin: svn revert -R [...]

Posted in essays | Also tagged | Leave a comment

By michael | Published: 8 Feb 2010

<a href=”http://vis.cs.ucdavis.edu/~ogawa/codeswarm/”>code_swarm</a>: An experiment in organic software visualization. via [@msantone](http://twitter.com/msantone)

Posted in photos | Also tagged | Leave a comment

svn merge trunk into branch

By michael | Published: 25 Nov 2009

Quick reminder for future reference: cd /path/to/branch/working/copy svn log Replace {branchrev} below with revision number of latest branch merge/copy from “svn log”: svn merge -r {branchrev}:HEAD /path/to/trunk/working/copy

Posted in essays | Tagged | Leave a comment

Ack! "svn revert" when you meant to "svn resolve"

By michael | Published: 28 Feb 2009

If you haven’t checked in yet, just maybe, a temporary copy of the conflicted file remains: cat path/to/reverted/file/.svn/tmp/* > hope_and_pray.txt open hope_and_pray.txt Look through the file to see if your missing code is there.

Posted in essays | Tagged | Leave a comment

Subversion + Natural Docs + GeSHi

By michael | Published: 3 Jun 2006

install subversion install natural docs in /home/naturaldocs install GeSHi in /home/geshi create master subversion repository for ALL projects in /home/repo/ create local working copy for processing in /home/src/ copy post-commit script below to /home/repo/hooks/post-commit chmod 755 /home/repo/hooks/post-commit TODO: show PHP script using GeSHi to highlight the source in /home/src #!/bin/sh Update local working copy svn [...]

Posted in essays | Tagged | Leave a comment