1 / 17

Collaboration with Subversion (SVN)

Collaboration with Subversion (SVN). http://flic.kr/p/6AVQFT. What are you going to learn about today?. Subversion features for facilitating collaboration Eclipse Subversive plug-in particulars. http://flic.kr/p/8JpkTg.

cburrows
Download Presentation

Collaboration with Subversion (SVN)

An Image/Link below is provided (as is) to download presentation Download Policy: Content on the Website is provided to you AS IS for your information and personal use and may not be sold / licensed / shared on other websites without getting consent from its author. Content is provided to you AS IS for your information and personal use only. Download presentation by click this link. While downloading, if for some reason you are not able to download a presentation, the publisher may have deleted the file from their server. During download, if you can't get a presentation, the file might be deleted by the publisher.

E N D

Presentation Transcript

  1. Collaboration with Subversion (SVN) http://flic.kr/p/6AVQFT

  2. What are you goingto learn about today? • Subversion features for facilitating collaboration • Eclipse Subversive plug-in particulars http://flic.kr/p/8JpkTg

  3. You’ve practiced using Subversion individuallyLet’s (naively) imagine what might happen if two developers worked on a project

  4. Repository A Jack Jill http://flic.kr/p/6kLBBi http://flic.kr/p/P1JPT

  5. Repository A A A svn checkout svn checkout Jack Jill http://flic.kr/p/6kLBBi http://flic.kr/p/P1JPT

  6. Repository A A’ A’’ Jack Jill edits edits http://flic.kr/p/6kLBBi http://flic.kr/p/P1JPT

  7. Repository A’ A’ A’’ svn commit Jack Jill http://flic.kr/p/6kLBBi http://flic.kr/p/P1JPT

  8. Repository Problem! Jack’s changes were lost A’’ A’ A’’ svn commit Jack Jill http://flic.kr/p/6kLBBi http://flic.kr/p/P1JPT

  9. Fortunately, Subversion is wise to this problem Let’s rewind and see how it would really happen when Jill commits Repository Problem! Jack’s changes were lost A’’ A’ A’’ svn commit Jack Jill http://flic.kr/p/6kLBBi http://flic.kr/p/P1JPT

  10. Repository SVN: Error.Out of date. A’ A’ A’’ svn commit Oh! I need to merge my changes Jack Jill http://flic.kr/p/6kLBBi http://flic.kr/p/P1JPT

  11. Repository A’ A’ A’’ A’ svn update Jack Jill http://flic.kr/p/6kLBBi http://flic.kr/p/P1JPT

  12. Repository A’ A’ A’’’ Jack Jill edits http://flic.kr/p/6kLBBi http://flic.kr/p/P1JPT

  13. Repository A’’’ A’ A’’’ svn commit Alright!That’s better Jack Jill http://flic.kr/p/6kLBBi http://flic.kr/p/P1JPT

  14. Repository A’’’ A’’’ svn update A’ A’’’ Jack, don’t forget to update Jack Jill Will do. Thanks! http://flic.kr/p/6kLBBi http://flic.kr/p/P1JPT

  15. Possible Results of DoingCommit and Update on a File • Update tries to automatically merge the files • If it can’t, then it • Marks file as conflicted • creates copies of relevant revisions in the working copy • these files have .r# suffix • and leaves it up to the user to merge and tell svn that the conflict on the file is “resolved”

  16. Eclipse demo time! http://flic.kr/p/5dfuqL

  17. Summary • Copy-modify-merge with Subversion • Eclipse SVN plugin features http://flic.kr/p/YSY3X

More Related