Subversion - A Summary Cheat Sheet(jwamicha.wordpress.com)
jwamicha.wordpress.com
Subversion - A Summary Cheat Sheet
http://jwamicha.wordpress.com/2008/05/29/subversion-a-summary-cheat-sheet-learn-svn-in-10-minutes/
6 comments
I say svn+ssh is perfect for working solo.
It can also work great for a team (multiple ssh keys, one per user, single 'svn' account on the server). That is, until you want to add some authorization/access control--that's a job for Apache + mod_dav + authz.
It can also work great for a team (multiple ssh keys, one per user, single 'svn' account on the server). That is, until you want to add some authorization/access control--that's a job for Apache + mod_dav + authz.
Good point... Easy (for me) to forget large teams exist ;)
Cheat sheets are great and all, but they don't teach you version control. I think that what we have here is a very difficult topic to grasp for most people, and countless cheat sheets don't make people understand them.
For example, look at how they are telling you to resolve conflicts.
5.) Resolve Conflicts (Merge Others’ Changes):
For example, look at how they are telling you to resolve conflicts.
5.) Resolve Conflicts (Merge Others’ Changes):
$svn update
$svn resolved
Resolving conflicts is almost never that easy, unless it's some white space. Even then you still want to peruse a diff to see what is going on. I know cheat sheets aren't meant as tutorials, but glossing over important stuff like resolving conflicts doesn't really help anybody.
$svn co svn+ssh://myhost/var/svn/repos
Just setup passwordless ssh if you haven't already, and it works like a dream.