Hi TM users,
I've never done revision control before, and I don't know where to start. I need something I can use on OS X, and works well with TM. If I Google for "OS X revesion control" I get many suggestions including Mercurial, CVS, GIT, Subversion, Bazaar.
I really have no idea where to start. I'd welcome some suggestions, or links to documentation I should perhaps read.
Thank you for any help you can give.
On 4 Oct 2011, at 12:50, Justin Catterall wrote:
I've never done revision control before, and I don't know where to start. I need something I can use on OS X, and works well with TM. If I Google for "OS X revesion control" I get many suggestions including Mercurial, CVS, GIT, Subversion, Bazaar.
Unless you need it for legacy stuff - which looks unlikely - then forget CVS.
Subversion is probably conceptually slightly simpler, but is centralised (so you need to have network access to the main/central repository before you can check changes in and do several other operations), and it (confusingly to some) maps branches (different lines of development) and tags (marked version snapshots) as effectively directory copies in its filesystem - this may be helpful for some, but confusing to others....
Git & Mercurial appear to be roughly on a par featurewise - I understand Mercurial's command naming may be a little more straightforward. My knowledge of Bazaar is very limited. An actual choice of which one to use is probably down to who else you are working with, and whether they have experience in one over another.
Textmate supports all of these. Personally I tend not to use Textmate's interfaces to the version control systems, but thats just how I work - I do however have git integration switched on and like having indications of whether or not the set of files I am working on are clean (ie checked into the version control system) or dirty.
I use git - I happen to use a version built using homebrew - http://mxcl.github.com/homebrew/ - which is also built on top of git (a little recursive maybe). An alternative place to get git binaries from is http://code.google.com/p/git-osx-installer/
I typically use Tower as a GUI on it - not necessary, but I like it - it is however a little expensive. http://www.git-tower.com/ An alternative GUI - most useful if you are looking back through lines of development - is GitX - http://gitx.laullon.com/ - this one is free
I really have no idea where to start. I'd welcome some suggestions, or links to documentation I should perhaps read.
Best Git documentation I think is Pro Git - a book, but also available online. Its a reasonable introduction to general version control, but obviously somewhat biased towards git. http://progit.org/book/
Nigel.
-- [ Nigel Metheringham ------------------------------ nigel@dotdot.it ] [ Ellipsis Intangible Technologies ]
Personally I use:
* git (from MacPorts)
is the best because:
* only one directory (.git) in the root of projects, no .svn directories everywhere
* nice interface to ignore files (.gitignore), not the crazy prop:edit of svn
* free open source hub: github.com , there is also a GUI for OSX (personally I prefer to use the Terminal: git is simple!)
* In OSX 10.7 with Xcode, git is now the default revision system
Best Regards
On Oct 4, 2011, at 2:39 PM, Nigel Metheringham wrote:
On 4 Oct 2011, at 12:50, Justin Catterall wrote:
I've never done revision control before, and I don't know where to start. I need something I can use on OS X, and works well with TM. If I Google for "OS X revesion control" I get many suggestions including Mercurial, CVS, GIT, Subversion, Bazaar.
Unless you need it for legacy stuff - which looks unlikely - then forget CVS.
Subversion is probably conceptually slightly simpler, but is centralised (so you need to have network access to the main/central repository before you can check changes in and do several other operations), and it (confusingly to some) maps branches (different lines of development) and tags (marked version snapshots) as effectively directory copies in its filesystem - this may be helpful for some, but confusing to others....
Git & Mercurial appear to be roughly on a par featurewise - I understand Mercurial's command naming may be a little more straightforward. My knowledge of Bazaar is very limited. An actual choice of which one to use is probably down to who else you are working with, and whether they have experience in one over another.
Textmate supports all of these. Personally I tend not to use Textmate's interfaces to the version control systems, but thats just how I work - I do however have git integration switched on and like having indications of whether or not the set of files I am working on are clean (ie checked into the version control system) or dirty.
I use git - I happen to use a version built using homebrew - http://mxcl.github.com/homebrew/ - which is also built on top of git (a little recursive maybe). An alternative place to get git binaries from is http://code.google.com/p/git-osx-installer/
I typically use Tower as a GUI on it - not necessary, but I like it - it is however a little expensive. http://www.git-tower.com/ An alternative GUI - most useful if you are looking back through lines of development - is GitX - http://gitx.laullon.com/ - this one is free
I really have no idea where to start. I'd welcome some suggestions, or links to documentation I should perhaps read.
Best Git documentation I think is Pro Git - a book, but also available online. Its a reasonable introduction to general version control, but obviously somewhat biased towards git. http://progit.org/book/
Nigel.
-- [ Nigel Metheringham ------------------------------ nigel@dotdot.it ] [ Ellipsis Intangible Technologies ]
textmate mailing list textmate@lists.macromates.com http://lists.macromates.com/listinfo/textmate
On 4 Oct 2011, at 13:46, Davide Rambaldi wrote:
- free open source hub: github.com , there is also a GUI for OSX (personally I prefer to use the Terminal: git is simple!)
Github has a ton of mindshare - and its a good place to work against. However Mercurial has BitBucket - not as well known, but its a rough equivalent - https://bitbucket.org/ (also appears to be a little less locked to one VCS).
[I had missed that Lion includes git - comes of using a Snow Leopard system upgraded to Lion]
Nigel.
-- [ Nigel Metheringham ------------------------------ nigel@dotdot.it ] [ Ellipsis Intangible Technologies ]
I use git within TextMate and in the terminal. Most of my day to day commits and pushes I do from within TextMate. Detailed history review I do in gitx.app or github.app
For hosting I use github for non-sensitive, open source stuff. For work stuff I use an in-house server.
On Oct 4, 2011, at 8:57 AM, Nigel Metheringham wrote:
On 4 Oct 2011, at 13:46, Davide Rambaldi wrote:
- free open source hub: github.com , there is also a GUI for OSX (personally I prefer to use the Terminal: git is simple!)
Github has a ton of mindshare - and its a good place to work against. However Mercurial has BitBucket - not as well known, but its a rough equivalent - https://bitbucket.org/ (also appears to be a little less locked to one VCS).
[I had missed that Lion includes git - comes of using a Snow Leopard system upgraded to Lion]
Nigel.
-- [ Nigel Metheringham ------------------------------ nigel@dotdot.it ] [ Ellipsis Intangible Technologies ]
textmate mailing list textmate@lists.macromates.com http://lists.macromates.com/listinfo/textmate
On Oct 4, 2011, at 8:39 AM, Nigel Metheringham wrote:
Git & Mercurial appear to be roughly on a par feature wise
I’ve only used git, but from what I’ve seen, this rings true.
I use git - I happen to use a version built using homebrew - http://mxcl.github.com/homebrew/ - which is also built on top of git (a little recursive maybe). An alternative place to get git binaries from is http://code.google.com/p/git-osx-installer/
If you’re on 10.7, you already have git installed. For that reason alone, I’d choose it over Mercurial (since you’re starting fresh and have no preference).
On 04/10/2011 13:39, Nigel Metheringham wrote:
Textmate supports all of these. Personally I tend not to use Textmate's interfaces to the version control systems, but thats just how I work - I do however have git integration switched on and like having indications of whether or not the set of files I am working on are clean (ie checked into the version control system) or dirty.
On a slightly unrelated topic, am I the only one not seeing the GIT status indicators (using Project+, git is enabled on the SCM pane)? SVN indicators show just fine, wondering what's wrong ... any hint? git version 1.7.4.4 TM version 1.5.10 (1631)
Textmate probably can't find your git binary. Is the correct path set in the preferences? Can you perform git actions within Textmate with a right click or Ctrl-Cmd-G?
vv
On a slightly unrelated topic, am I the only one not seeing the GIT status indicators (using Project+, git is enabled on the SCM pane)? SVN indicators show just fine, wondering what's wrong ... any hint? git version 1.7.4.4 TM version 1.5.10 (1631)
textmate mailing list textmate@lists.macromates.com http://lists.macromates.com/listinfo/textmate
Thank you, the PATH variable was wrong, should've thought that myself ... now letting SVN go will be less painful.
On 04/10/2011 14:11, Vish Vishvanath wrote:
Textmate probably can't find your git binary. Is the correct path set in the preferences? Can you perform git actions within Textmate with a right click or Ctrl-Cmd-G?
vv
On a slightly unrelated topic, am I the only one not seeing the GIT status indicators (using Project+, git is enabled on the SCM pane)? SVN indicators show just fine, wondering what's wrong ... any hint? git version 1.7.4.4 TM version 1.5.10 (1631)
On 4 Oct 2011, at 12:50, Justin Catterall wrote:
Hi TM users,
I've never done revision control before, and I don't know where to start.
Thank you for all the quick replies. GIT appears to get the most votes... all the votes! And seeing as you're all using a very similar setup to me I'd probably be a fool to go with anything else.
You've been very helpful, thank you.
Justin Catterall 100621.1@masonsmusic.co.uk wrote:
On 4 Oct 2011, at 12:50, Justin Catterall wrote:
Hi TM users,
I've never done revision control before, and I don't know where to start.
Thank you for all the quick replies. GIT appears to get the most votes... all the votes! And seeing as you're all using a very similar setup to me I'd probably be a fool to go with anything else.
You've been very helpful, thank you.
The O'Reilly Git book is excellent. So are the tutorials on github. m.
As is the Pro Git book (free and open source): http://progit.org/
Adam Merrifield seyDoggy vCard: seydoggy.com/vcard
On Oct 5, 2011, at 3:44 PM, Matt Neuburg wrote:
Justin Catterall 100621.1@masonsmusic.co.uk wrote:
On 4 Oct 2011, at 12:50, Justin Catterall wrote:
Hi TM users,
I've never done revision control before, and I don't know where to start.
Thank you for all the quick replies. GIT appears to get the most votes... all the votes! And seeing as you're all using a very similar setup to me I'd probably be a fool to go with anything else.
You've been very helpful, thank you.
The O'Reilly Git book is excellent. So are the tutorials on github. m.
-- matt neuburg, phd = matt@tidbits.com http://www.tidbits.com/matt/ A fool + a tool + an autorelease pool = cool! AppleScript: the Definitive Guide - Second Edition! http://www.tidbits.com/matt/default.html#applescriptthings
textmate mailing list textmate@lists.macromates.com http://lists.macromates.com/listinfo/textmate
On 5 Oct 2011, at 21:09, Merrifield Adam wrote:
As is the Pro Git book (free and open source): http://progit.org/
That's interesting, I don't fancy spending 27 quid on the O'Reilly book at this stage. Thank you.
-
Davide Rambaldi -
Emiliano Fuksas -
Justin Catterall -
matt＠tidbits.com -
Merrifield Adam -
Nigel Metheringham -
Rob McBroom -
Vish Vishvanath