Download - Subversion
![Page 1: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/1.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
![Page 2: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/2.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
SubversionOpen Source Version Control
![Page 3: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/3.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
Version control?
![Page 4: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/4.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
Version control?freedeedom
![Page 5: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/5.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
![Page 6: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/6.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
In the old days...
Wait!
Why am I using a Mac?
![Page 7: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/7.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
This new code is
awesome!
This new code is
awesome!
In the old days...
![Page 8: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/8.jpg)
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...
![Page 9: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/9.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
Conflict Resolution
In the old days...
![Page 10: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/10.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
Subversion
This new code is
awesome!
Commit
![Page 11: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/11.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
Hey! That is some awesome
code!
Update
Subversion
![Page 12: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/12.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
This new code is
awesome!
This new code is
awesome!
Commit Commit
Subversion
![Page 13: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/13.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
I'll merge your changes into a big
ball of awesomeness!
Subversion
![Page 14: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/14.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
We rock!Let's go get milkshakes!
We rock!Let's go get milkshakes!
Subversion
![Page 15: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/15.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
You both changed the same code! I can't merge this!
Subversion
![Page 16: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/16.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
Conflict Resolution?
Subversion
![Page 17: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/17.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
NO!Conflict Resolution?
Subversion
![Page 18: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/18.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
Conflict Resolution.
Subversion
![Page 19: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/19.jpg)
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
![Page 20: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/20.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
Some Idiot Commits a Change
Commit
![Page 21: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/21.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
Some Idiot Commits a Change
![Page 22: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/22.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
Some Idiot Commits a Change
Checkout theprevious revision.
Then, commit.
![Page 23: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/23.jpg)
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.
![Page 24: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/24.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
I fixed Vista!
Subversion
![Page 25: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/25.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
No, wait.Undo that.
Revert
Subversion
![Page 26: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/26.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
Computer broken?Get a new computer.Then, get a fresh copyof your code fromSubversion.
![Page 27: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/27.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
Computer broken?You'll only lose whatyou haven'tcommitted yet.
![Page 28: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/28.jpg)
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.
![Page 29: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/29.jpg)
Dave RossThe West Suburban Chicago PHP Meetupsuburbanchicagophp.org
Subversion Clients
And many more.
Seriously, they're like rabbits.
![Page 30: Subversion](https://reader036.vdocument.in/reader036/viewer/2022062616/54b527cc4a79596e4c8b4571/html5/thumbnails/30.jpg)
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