«
»

6 Oct

Mac with Mercurial GUI

Posted October 6, 2011 by Jamison White in Programming.

I needed to help our marketing guys get a couple sites under source control. We have Mercurial and SVN servers already. Mercurial seems like the best choice because it handles directory moves and renames much better than SVN.

Mac Source Control Setup*

  1. Install Python
  2. Install Mercurial for source control management
  3. Install DiffMerge for diff/merge tool
  4. Install SourceTree as Mercurial GUI
    1. Commercial product that is currently free
    2. In preferences select DiffMerge as diff and merge tool
    3. When setting up repo, add your username to the URL so that you don’t have to type in username and password all the time
  5. Install KOD for decent text editor (optional)
* I installed from web sites, but I know a few of these are available in the Mac AppStore.

Mac Research Setup

Mecurial GUI’s

  1. SourceTree – Good; selected
  2. MacHG – Good
  3. Murky – Bad; Still in alpha
  4. TortiseHG – Install is bad

Diff/Merge Tools

  1. DiffMerge – OK; selected
  2. DeltaWalker – buggy
  3. Kdiff3 – ugly
  4. Araxis — $130 license
  5. P4Merge – Crazy expensive

Leave a Reply

Fill in your details below or click an icon to log in:

Gravatar
WordPress.com Logo

You are commenting using your WordPress.com account. ( Log Out / Change )

Twitter picture

You are commenting using your Twitter account. ( Log Out / Change )

Facebook photo

You are commenting using your Facebook account. ( Log Out / Change )

Cancel

Connecting to %s