Version Control! Scenarios, Working with Git!

Transcription

1 Version Control! Scenarios, Working with Git!!

2 Scenario 1! You finished the assignment at home! VC 2

3 Scenario 1b! You finished the assignment at home! You get to York to submit and realize you did not upload it! VC 3

4 Scenario 1c! You finished the assignment at home! You get to York to submit and realize you did not upload it! Has this ever happened to you?! VC 4

5 Scenario 2! Your program works pretty well! VC 5

6 Scenario 2b! Your program works pretty well! You make a lot of improvements! VC 6

7 Scenario 2c! Your program works pretty well! You make a lot of improvements! But you haven t got them to work yet! VC 7

8 Scenario 2d! Your program works pretty well! You make a lot of improvements! But you haven t got them to work yet! You need to demo your program now! VC 8

9 Scenario 3! You are working on the 2.0 version of your great app but 2.0 does not quite compile yet and a customer finds a critical bug in 1.0, which must be fixed ASAP! VC 9

10 Scenario 3b! You are working on the 2.0 version of your great app but 2.0 does not quite compile yet and a customer finds a critical bug in 1.0, which must be fixed ASAP! If you are smart, you have a copy of your 1.0 source. You make the change and release it but how do you merge your changes into your 2.0 program text?! VC 10

11 Scenario 3c! You are working on the 2.0 version of your great app but 2.0 does not quite compile yet and a customer finds a critical bug in 1.0, which must be fixed ASAP! If you are smart, you have a copy of your 1.0 source. You make the change and release it but how do you merge your changes into your 2.0 program text?! You you are not so smart, you have no source program text saved.! VC 11

12 Scenario 3d! You are working on the 2.0 version of your great app but 2.0 does not quite compile yet and a customer finds a critical bug in 1.0, which must be fixed ASAP! If you are smart, you have a copy of your 1.0 source. You make the change and release it but how do you merge your changes into your 2.0 program text?! You you are not so smart, you have no source program text saved.! You have no way to track down the bug and you lose face until 2.0 is ready! VC 12

13 Scenario 4! You change one part of a program! VC 13

14 Scenario 4b! You change one part of a program! It works! VC 14

15 Scenario 4c! You change one part of a program! It works! Your teammate changes another part! VC 15

16 Scenario 4d! You change one part of a program! It works! Your teammate changes another part! It works! VC 16

17 Scenario 4e! You change one part of a program! It works! Your teammate changes another part! It works! You put it together! VC 17

18 Scenario 4f! You change one part of a program! It works! Your teammate changes another part! It works! You put it together! It DOES NOT WORK! VC 18

19 Scenario 4g! You change one part of a program! It works! Your teammate changes another part! It works! You put it together! It DOES NOT WORK! What were all the changes?!! VC 19

20 Scenario 5! You make a number of improvements to a class! VC 20

21 Scenario 5b! You make a number of improvements to a class! Your teammate makes a number of different improvements to the same class! How can you merge these changes?! VC 21

22 A poor solution! There are a number of tools that help you spot changes differences between two files, such as diff! VC 22

23 A poor solution 2! There are a number of tools that help you spot changes differences between two files, such as diff! Of course, they won t help unless you kept a copy of the older version! VC 23

24 A poor solution 3! There are a number of tools that help you spot changes differences between two files, such as diff! Of course, they won t help unless you kept a copy of the older version! Differencing tools are useful for finding a small number of differences in a few files! VC 24

25 A poor solution 4! There are a number of tools that help you spot changes differences between two files, such as diff! Of course, they won t help unless you kept a copy of the older version! Differencing tools are useful for finding a small number of differences in a few files! A better solution! VC 25

26 Version control systems! Keep multiple, older and newer, versions of everything! VC 26

27 Version control systems 2! Keep multiple, older and newer, versions of everything! Not just program source text! VC 27

28 Version control systems 3! Keep multiple, older and newer, versions of everything! Not just program source text! Request comments regarding every change! VC 28

29 Version control systems 4! Keep multiple, older and newer, versions of everything! Not just program source text! Request comments regarding every change! Display differences between versions! VC 29

30 Version control systems 5! Keep multiple, older and newer, versions of everything! Not just program source text! Request comments regarding every change! Display differences between versions! Allow merging of changes on the same file! VC 30

31 Centralized version control! Traditional version control system! Server with database! Clients have a working version! VC 31

32 Centralized version control 2! Traditional version control system! Server with database! Clients have a working version! Examples! CVS! Subversion! VC 32

33 Centralized version control 3! Traditional version control system! Server with database! Clients have a working version! Examples! CVS! Subversion! Challenges! Multi-developer conflicts! Client/server communication! VC 33

34 Distributed version control 2! Authoritative server by convention only! Every working checkout is a repository! VC 34

35 Distributed version control 3! Authoritative server by convention only! Every working checkout is a repository! Get version control even when detached! VC 35

36 Distributed version control 5! Authoritative server by convention only! Every working checkout is a repository! Get version control even when detached! Backups are trivial! Examples! Git! Bitkeeper! VC 36

37 Terminology! A repository contains several branches! VC 37

38 Terminology 2! A repository contains several branches! The main branch is call the master! VC 38

39 Terminology 3! A repository contains several branches! The main branch is call the master! Branches break off from the master to try something new, e.g. a new feature, program text restructuring, etc.! VC 39

40 Terminology 4! A repository contains several branches! The main branch is call the master! Branches break off from the master to try something new, e.g. a new feature, program text restructuring, etc.! Branches can be merged with other branches or into the master! VC 40

41 Terminology 5! A repository contains several branches! The main branch is call the master! Branches break off from the master to try something new, e.g. a new feature, program text restructuring, etc.! Branches can be merged with other branches or into the master! Tags are usually official releases that have to be supported! VC 41

42 Working with git! We do the following! Create a repository online! VC 42

43 Working with git 2! We do the following! Create a repository online! Create a local repository, add a project to it, and push it to the online repository! VC 43

44 Working with git 3! We do the following! Create a repository online! Create a local repository, add a project to it, and push it to the online repository! All team members get the online repository! VC 44

45 Working with git 4! We do the following! Create a repository online! Create a local repository, add a project to it, and push it to the online repository! All team members get the online repository! Changes pushed by one team member can now be pulled by all! VC 45

46 Creating the repository! Once per tem! Go to github.com! Sign up for a new account! Create a new repository! Copy the URL to access your repository!! VC 46

47 Creating a local project repository! Once per team (practice example)! Run Eclipse! Create a new project called ProjectWithGit that contains a main method that prints Fun with Git! Go to Eclipse -> Preferences -> Team -> Git -> Configuration! Click Add Entry, add the pair [user.name, your_name]! Click Add Entry, add the pair [user. , your_ ]! These should be the same as the ones used at github.com! Click Apply, then OK! VC 47

48 Creating a local project repository 2! Once per team (practice example) cont d! Right click on ProjectWithGit and Select Team -> Share Project! Click on Create! Provide a name for your local repository, and click Finish! Your local repository is now setup! VC 48

49 Pushing the first local repository! Once per team (practice example) cont d! Right click on ProjectWithGit and select Team -> Commit! Provide name and ! Add a commit message! It is important that you add a message every time you commit makes it easier to find a version later! Select all files, and click Commit! Close editors, reopen, make a change to the output of your program and Commit again! VC 49

50 Pushing the first local repository 2! Once per team (practice example) cont d! Right click on ProjectWithGit and select Team -> Remote -> Push! Copy the URL from github.com in the URI field! Enter your github.com username and password, click NEXT! Select master from from the Source ref pull down menu! Click on Add All Branches Spec! Click Finish, then OK! You should be able to see ProjectWithGit in github.com! VC 50

51 Deleting the local repository! Once per team (practice example) cont d! Due to an Eclipse but, it is easy to delete the local repository, and re-get it from github.com along with the other team members! Right click on ProjectWithGit in Eclipse select Delete! Select to delete project contents on disk, and click OK! VC 51

52 Copying a repository! All team members! Start Eclipse! Go to File -> Import -> Git -> Projects from Git! Click Next, select Clone URI,! Keep clicking Next until you can click Finish! You now have a copy of the project in your local repository! To push changes to the remote repository, you will need a github.com account that is added as a collaborator! VC 52

53 Push to repository! Each team member! Make some changes to any of the classes in the project! Right click on any element that has changes (could be the whole project), and select Team -> Commit! Add a commit message! If you do not want to publish the changes yet, click Commit! If the changes are ready to be published, click Commit and Push! VC 53

54 Pull from repository! To get changes published by other team members! Right click on the project, and select Team -> Pull! VC 54

55 Homework! Get git working for every team member! For program text / documents / notes etc.! Demonstrate that everybody can pull / push program text in the next lab.! VC 55

56 Subversion (SVN)! A server holds all original files of a project!! VC 56

57 Subversion 2! A server holds all original files of a project! Gives out copies to participants!!! VC 57

58 Subversion 3! A server holds all original files of a project! Gives out copies to participants! Participants modify their copies and submit their changes to the server!!! VC 58

59 Subversion 4! A server holds all original files of a project! Gives out copies to participants! Participants modify their copies and submit their changes to the server! The server automatically merges changes into the original files!!! VC 59

60 Subversion conflicts! Conflicts only occur when modifications are done!! VC 60

61 Subversion conflicts 2! Conflicts only occur when modifications are done! By more than one participant!! VC 61

62 Subversion conflicts 3! Conflicts only occur when modifications are done! By more than one participant! At the same location in their respective copies!! VC 62

63 Subversion conflicts 4! Conflicts only occur when modifications are done! By more than one participant! At the same location in their respective copies! Then participants have to manually resolve such conflicts! VC 63

64 SVN support! Powerful edit and merge tools help make conflict management easy! VC 64

65 SVN support 2! Powerful edit and merge tools help make conflict management easy! SVN keeps a log of any changes made to any file! VC 65

66 SVN support 3! Powerful edit and merge tools help make conflict management easy! SVN keeps a log of any changes made to any file! Participants can go back and receive older versions of a file or even an older version of an entire project state! VC 66

67 SVN action Checkout! Receive a copy of an entire project from the SVN server! Source files! Project & make files! Resource files! Etc.! VC 67

68 SVN action Update! Receive copies of individual files or folders from the server! Merges the copies with your current local copy! VC 68

69 SVN action Commit! Sends an updated file (your local copy) to the SVN server! The copy is incorporated into the original project database! A new version number is assigned! VC 69

70 SVN action Commit 2! Sends an updated file (your local copy) to the SVN server! The copy is incorporated into the original project database! A new version number is assigned! Before doing a commit! You must do an update (and resolve any possible conflicts) before you commit.! VC 70

71 SVN action Add! Notifies SVN of a new file or folder that needs to be added to the existing project! Only if the SVN is aware of a file, can you commit the file! VC 71

72 SVN action Add! Notifies SVN of a new file or folder that needs to be added to the existing project! Only if the SVN is aware of a file, can you commit the file! You must use add before you can commit a new file or folder! VC 72

73 SVN action Add! Notifies SVN of a new file or folder that needs to be added to the existing project! Only if the SVN is aware of a file, can you commit the file! You must use add before you can commit a new file or folder! To delete a file you need to!! Delete it in your local folder! Then commit the folder! VC 73

74 Further considerations! Make sure to update regularly otherwise! You will have lots of conflicts! And lots of problems! VC 74

75 Further considerations 2! Make sure to update regularly otherwise! You will have lots of conflicts! And lots of problems! SVN will not help you! If you do not commit regularly! VC 75

76 Further considerations 3! Make sure to update regularly otherwise! You will have lots of conflicts! And lots of problems! SVN will not help you! If you do not commit regularly! If you add lots of new stuff! Make sure to commit everything! VC 76

77 Git advantages! Resilience! No one repository has more data than any other! VC 77

78 Git advantages 2! Resilience! No one repository has more data than any other! Speed! Very fast operations compared to other VCSs! VC 78

79 Git advantages 3! Resilience! Speed! No one repository has more data than any other! Very fast operations compared to other VCSs! Space! Compression can be done across the repository, not just per file! Minimizes local size as well as push / pull transfers! VC 79

80 Git advantages 4! Resilience! Speed! Space! No one repository has more data than any other! Very fast operations compared to other VCSs! Compression can be done across the repository, not just per file! Minimizes local size as well as push / pull transfers! Simplicity! Object model is simple! VC 80

81 Git advantages 5! Resilience! Speed! Space! No one repository has more data than any other! Very fast operations compared to other VCSs! Compression can be done across the repository, not just per file! Minimizes local size as well as push / pull transfers! Simplicity! Object model is simple! Large user base with robust tools! VC 81