Subversion

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org


SubversionOpen Source Version Control


Version control?


Version control?freedeedom



In the old days...

Wait!

Why am I using a Mac?


This new code is

awesome!

This new code is

awesome!

In the old days...


Hey! You saved over my

awesome code!

Hey! You saved over my

awesome code!

In the old days...


Conflict Resolution

In the old days...


Subversion

This new code is

awesome!

Commit


Hey! That is some awesome

code!

Update

Subversion


This new code is

awesome!

This new code is

awesome!

Commit Commit

Subversion


I'll merge your changes into a big

ball of awesomeness!

Subversion


We rock!Let's go get milkshakes!

We rock!Let's go get milkshakes!

Subversion


You both changed the same code! I can't merge this!

Subversion


Conflict Resolution?

Subversion


NO!Conflict Resolution?

Subversion


Conflict Resolution.

Subversion


1. Merge the changes yourself(using a tool like WinMerge or a text editor)2. Tell Subversion the changes are resolved

3. Commit the resolved version4. Go get milkshakes

Conflict Resolution.

Subversion


Some Idiot Commits a Change

Commit





Checkout theprevious revision.

Then, commit.


...and it's like itnever happened.

You can go back to any old version at any time.


I fixed Vista!

Subversion


No, wait.Undo that.

Revert

Subversion


Computer broken?Get a new computer.Then, get a fresh copyof your code fromSubversion.


Computer broken?You'll only lose whatyou haven'tcommitted yet.


Not just for developers.Some sysadmins use version control to

track changes to config files.

They like the “revert” commandfor when they really mess up.


Subversion Clients

And many more.

Seriously, they're like rabbits.


For More Information:

Version Control With Subversionhttp://svnbook.red-bean.com/(or buy the book – authors gotta eat, too)

subversion.tigris.org

Wikipedia

Technology

Subversion