Posts tagged "subversion" « SaltyCrane Blog

Using kdiff3 with svn merge

Date: 2010-02-04 | Tags: notestoself, subversion

http://www.dronecode.org.uk/daybook/2008/10/graphical-merge-for-subversion.html

Reference documentation

Using External Differencing and Merge Tools
Resolve Conflicts (Merging Others' Changes)
Config file
... read more »

Example of hg convert on Ubuntu

Date: 2009-08-05 | Tags: mercurial, subversion

Converting a Subversion repository to a Mercurial repository is very easy. Here's an example that uses hg convert to convert a SVN repository (django-tagging) to Mecurial on Ubuntu. I'm using Mercurial 1.3 on Ubuntu 9.04.

Install Subversion Python bindings. (This should solve the "Subversion python bindings could not be loaded" error)
```
sudo apt-get install python-subversion
```
Enable the "convert" extension. Add the following to your ~/.hgrc file:
```
[extensions]
hgext.convert =
```

Convert:

hg convert http://django-tagging.googlecode.com/svn/trunk/ django-tagging-hg

Update:
```
cd django-tagging-hg
hg update
```

My software tools list

Date: 2007-08-10 | Modified: 2010-05-28 | Tags: android, c_cplusplus, colinux, conkeror, cygwin, django, eclipse, emacs, git, hardware, keyboard, linux, mercurial, preferences, python, softwaretools, subversion, ubuntu, urxvt, wide, wmii | 6 Comments

Inspired by Mark Pilgrim's 2006 Essentials list, below is a list of my current software tools. If you notice a lot of "I switched from ..." statements, keep in mind that I am a programmer who likes shiny things.

Other lists¶

Mark Pilgrim's Essentials, 2008 edition
Adam Gomaa's Essentials (2008)
Here is a 2010 update for Mark Pilgrim. After 2 and a half years, I still have several items in common: Ubuntu running rxvt-unicode and Emacs 23, the Unicomp keyboard, an Android phone, Gmail, Google Reader, Google Docs, and Pandora.
Salvatore Sanfilippo on usesthis.com (2011)
Aaron Boodman ...

How to show diffs with Subclipse

Date: 2007-04-04 | Tags: eclipse, subversion

I want to show revision history diffs in SVN/Subclipse/Eclipse. I looked in the "History" view, but this is not where to find it. Instead, right-click on your file in the "Navigator" view, select "Compare With" > "Revision...". Then double-click on a revision to compare to. The example screenshot is from Mark's blog. ... read more »

How to setup a subclipse project to branch/tag

Date: 2007-03-29 | Modified: 2008-09-07 | Tags: eclipse, subversion | 11 Comments

I've read that branching/tagging is one of the nice features of SVN (See Mark Phippard's blog and the subversion book). However, it took me a little while to figure out how to set up my directory structure with the recommended "trunk", "branches", and "tags" folders. These are my basic step-by-step notes for how I set up my Subclipse project and then created a branch. This assumes you've already installed Subclipse and set up a repository. If you have not done that, see How to install Subversion (SVN) with Eclipse on Windows.

Add your Eclipse project to ...

How to install Subversion (SVN) with Eclipse on Windows

Date: 2007-03-01 | Modified: 2008-09-08 | Tags: eclipse, subversion | 5 Comments

Subversion looks to be the new version control system of choice in the open source community, supplanting CVS which supplanted RCS. This article, Why Subversion Over CVS, gives some reasons to choose Subversion over CVS. Many people also choose subversion over commercial products such as ClearCase and Visual Source Safe. The authors of "Windows Developer Power Tools" (O'Reilly 2006) write:

Subversion is our favorite version-control system, and we definitely recommend it above all others (including commercial products) in most scenarios. There may be certain areas where commercial systems excel, but for overall version control, it's tough to beat ...