Subversion

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

SubversionOpen Source Version Control

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

Version control?

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

Version control?freedeedom

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

In the old days...

Wait!

Why am I using a Mac?

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

This new code is

awesome!

This new code is

awesome!

In the old days...

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

Hey! You saved over my

awesome code!

Hey! You saved over my

awesome code!

In the old days...

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

Conflict Resolution

In the old days...

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

Subversion

This new code is

awesome!

Commit

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

Hey! That is some awesome

code!

Update

Subversion

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

This new code is

awesome!

This new code is

awesome!

Commit Commit

Subversion

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

I'll merge your changes into a big

ball of awesomeness!

Subversion

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

We rock!Let's go get milkshakes!

We rock!Let's go get milkshakes!

Subversion

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

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

Subversion

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

Conflict Resolution?

Subversion

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

NO!Conflict Resolution?

Subversion

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

Conflict Resolution.

Subversion

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

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

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

Some Idiot Commits a Change

Commit

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

Some Idiot Commits a Change

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

Some Idiot Commits a Change

Checkout theprevious revision.

Then, commit.

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

...and it's like itnever happened.

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

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

I fixed Vista!

Subversion

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

No, wait.Undo that.

Revert

Subversion

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

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

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

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

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

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.

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

Subversion Clients

And many more.

Seriously, they're like rabbits.

Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org

For More Information:

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

subversion.tigris.org

Wikipedia