Easy-to-follow video tutorials help you learn software, creative, and business skills.Become a member

Getting files in and out of a repository

From: Fundamentals of Software Version Control

Video: Getting files in and out of a repository

The first thing you need to know to use Version Control is how to create either the entire repository or how to create a portion of the repository for the project you're working on. For a Centralized Version Control, most often the repository itself is created for you by your system administrator. With Distributed Version Control, you'll create the repository yourself at least on your local machine. And then you may synchronize it with another repository created on the server by an administrator. So you create the repository by using a command that's sometimes called initialize and sometimes called create.

Getting files in and out of a repository

The first thing you need to know to use Version Control is how to create either the entire repository or how to create a portion of the repository for the project you're working on. For a Centralized Version Control, most often the repository itself is created for you by your system administrator. With Distributed Version Control, you'll create the repository yourself at least on your local machine. And then you may synchronize it with another repository created on the server by an administrator. So you create the repository by using a command that's sometimes called initialize and sometimes called create.

And what this does is create an empty space for you to put your files and directories in, as we did in our sample before where we simply created myprog.c and checked it in. If your files already exist, meaning you're adding an existing project to Version Control, you can use the Add feature of your Version Control Software to bulk add all the files and directories into your working set and then check them in. In Distributed Version Control, there's usually a concept between your file system and the repository that's called the staging area.

So, when you actually do an add, the files go from your working set into the staging area and then from the staging area into the repository, because 99% of the time, the concept of using the staging area as two steps is more than you actually need, as we did in the previous demos. I did git commit -a -m and the -a meant add any files that are in the working set that aren't already in the repository automatically.

So I could do that commit as a single step. Now of course, once you've got your files in, you want to get them back out in order to be able to work on them. And depending on the type of Version Control System you're using, whether it's Centralized or Distributed, you may be required to tell the Version Control System that you're going to start making changes to the files. Most centralized systems have the concept of check out. This means that you are telling the Version Control System that you are going to work on this file. So it will actually lock the file so other people cannot make changes until you check it back in.

So, version Perforce and TFS allow you to specify which kinds of files, and which files require a lock on checkout, and which files don't. For example, you would typically require a lock on files that are non-textual, like images, or Zip files, or audio recordings, because the Version Control System can't easily detect the subtlety of a change in one portion of an image that you make and a change in another portion of an image that someone else makes and actually merge them together.

So, if the files are not locked on checkout, then you might end up with conflicts when you check them back in. So, the reason that the centralized systems put the lock on there is to make sure that it's easy to make sure that reduces the number of conflicts and the number of problems you have checking in and merging. So for example, if Joe makes changes to a file, and then Arlene also makes changes to the same file, Joe can check his file, and then later when Arlene tries to check in, the server says that the changes conflict, and she ends up doing a manual differencing in order to resolve these things.

TFS in particular has a feature called shelving which allows you to check out files and lock them, and then if you're not finished working on them before somebody else needs to make a change, you are going to actually take all the files you have checked out and put them in to what's called a shelf set, and essentially puts them up on the shelf so that the files can be unlocked and other people can work on it and then you can take your shelf set off the shelf, put it back into your working set, and do some more changes and then check in, because your changes don't necessarily conflict with what somebody else needed to do.

But since the system actually locks the files, you may want to make sure that the person who needs to get in there can actually make those changes when they need to. Distributed Version Control Systems like Git and Mercurial specifically have made the concept of branching super lightweight. When you say git branch, it actually simply creates one extra file, and doesn't make literally a second copy of the entire directory in your working set. And when using Git and Mercurial in a team, the workflow is usually instead of locking the files, you actually branch the entire repository, make your changes, and then merge back in because it's such a lightweight process.

We'll dig into more about that when we talk about branching and merging and when we demonstrate branching and merging in Mercurial and Git.

Show transcript

This video is part of

Image for Fundamentals of Software Version Control
Fundamentals of Software Version Control

49 video lessons · 11951 viewers

Michael Lehman
Author

 
Expand all | Collapse all
  1. 2m 12s
    1. Welcome
      56s
    2. What you should know before taking this course
      23s
    3. Using the exercise files
      53s
  2. 25m 8s
    1. Overview of software version control
      2m 51s
    2. Understanding version control concepts
      5m 14s
    3. Demo one: Getting started
      11m 1s
    4. Demo two: Handling the "oops"
      6m 2s
  3. 11m 3s
    1. The history of version control
      3m 44s
    2. Terminology
      4m 27s
    3. Exploring centralized vs. distributed systems
      2m 52s
  4. 28m 42s
    1. Getting files in and out of a repository
      4m 38s
    2. Saving changes and tracking history
      2m 47s
    3. Reverting to a prior version
      1m 42s
    4. Creating tags and labels
      1m 5s
    5. Branching and merging
      4m 10s
    6. Exploring workflow integration and continuous builds
      2m 46s
    7. Using graphical user interface (GUI) tools
      2m 39s
    8. Integrating a version control system with an integrated development environment (IDE)
      2m 50s
    9. Examining shell integration
      3m 26s
    10. Looking at forward and reverse integration
      2m 39s
  5. 25m 59s
    1. Installation and setup
      3m 31s
    2. Creating a repository and a project
      5m 10s
    3. Working with check-in, checkout, and revert
      6m 12s
    4. Tagging
      1m 34s
    5. Branching and merging
      5m 32s
    6. Working with GUI clients and IDE integration
      4m 0s
  6. 16m 13s
    1. Installation and setup
      55s
    2. Working with check-in, checkout, and revert
      9m 34s
    3. Tagging
      1m 7s
    4. Branching and merging
      4m 37s
  7. 26m 41s
    1. Installation and setup
      3m 47s
    2. Creating a repository and a project
      6m 15s
    3. Working with check-in, checkout, and revert
      8m 31s
    4. Tracking history and tagging
      2m 15s
    5. Branching and merging
      5m 53s
  8. 19m 25s
    1. Installation and setup
      3m 1s
    2. Creating a repository and a project
      1m 6s
    3. Working with check-in, checkout, and revert
      6m 39s
    4. Tagging
      2m 13s
    5. Branching and merging
      3m 44s
    6. Working with GUI clients and IDE integration
      2m 42s
  9. 16m 54s
    1. Installation and setup
      1m 48s
    2. Creating a repository and a project
      59s
    3. Working with check-in, checkout, revert, and tracking history
      6m 9s
    4. Tagging
      1m 50s
    5. Branching and merging
      4m 29s
    6. Exploring GUI and shell integration
      1m 39s
  10. 3m 38s
    1. Selecting a software version control that is right for you
      2m 30s
    2. Next steps
      1m 8s

Start learning today

Get unlimited access to all courses for just $25/month.

Become a member
Sometimes @lynda teaches me how to use a program and sometimes Lynda.com changes my life forever. @JosefShutter
@lynda lynda.com is an absolute life saver when it comes to learning todays software. Definitely recommend it! #higherlearning @Michael_Caraway
@lynda The best thing online! Your database of courses is great! To the mark and very helpful. Thanks! @ru22more
Got to create something yesterday I never thought I could do. #thanks @lynda @Ngventurella
I really do love @lynda as a learning platform. Never stop learning and developing, it’s probably our greatest gift as a species! @soundslikedavid
@lynda just subscribed to lynda.com all I can say its brilliant join now trust me @ButchSamurai
@lynda is an awesome resource. The membership is priceless if you take advantage of it. @diabetic_techie
One of the best decision I made this year. Buy a 1yr subscription to @lynda @cybercaptive
guys lynda.com (@lynda) is the best. So far I’ve learned Java, principles of OO programming, and now learning about MS project @lucasmitchell
Signed back up to @lynda dot com. I’ve missed it!! Proper geeking out right now! #timetolearn #geek @JayGodbold
Share a link to this course

What are exercise files?

Exercise files are the same files the author uses in the course. Save time by downloading the author's files instead of setting up your own files, and learn by following along with the instructor.

Can I take this course without the exercise files?

Yes! If you decide you would like the exercise files later, you can upgrade to a premium account any time.

Become a member Download sample files See plans and pricing

Please wait... please wait ...
Upgrade to get access to exercise files.

Exercise files video

How to use exercise files.

Learn by watching, listening, and doing, Exercise files are the same files the author uses in the course, so you can download them and follow along Premium memberships include access to all exercise files in the library.


Exercise files

Exercise files video

How to use exercise files.

For additional information on downloading and using exercise files, watch our instructional video or read the instructions in the FAQ.

This course includes free exercise files, so you can practice while you watch the course. To access all the exercise files in our library, become a Premium Member.

Are you sure you want to mark all the videos in this course as unwatched?

This will not affect your course history, your reports, or your certificates of completion for this course.


Mark all as unwatched Cancel

Congratulations

You have completed Fundamentals of Software Version Control.

Return to your organization's learning portal to continue training, or close this page.


OK
Become a member to add this course to a playlist

Join today and get unlimited access to the entire library of video courses—and create as many playlists as you like.

Get started

Already a member?

Become a member to like this course.

Join today and get unlimited access to the entire library of video courses.

Get started

Already a member?

Exercise files

Learn by watching, listening, and doing! Exercise files are the same files the author uses in the course, so you can download them and follow along. Exercise files are available with all Premium memberships. Learn more

Get started

Already a Premium member?

Exercise files video

How to use exercise files.

Ask a question

Thanks for contacting us.
You’ll hear from our Customer Service team within 24 hours.

Please enter the text shown below:

The classic layout automatically defaults to the latest Flash Player.

To choose a different player, hold the cursor over your name at the top right of any lynda.com page and choose Site preferencesfrom the dropdown menu.

Continue to classic layout Stay on new layout
Exercise files

Access exercise files from a button right under the course name.

Mark videos as unwatched

Remove icons showing you already watched videos if you want to start over.

Control your viewing experience

Make the video wide, narrow, full-screen, or pop the player out of the page into its own window.

Interactive transcripts

Click on text in the transcript to jump to that spot in the video. As the video plays, the relevant spot in the transcript will be highlighted.

Are you sure you want to delete this note?

No

Your file was successfully uploaded.

Thanks for signing up.

We’ll send you a confirmation email shortly.


Sign up and receive emails about lynda.com and our online training library:

Here’s our privacy policy with more details about how we handle your information.

Keep up with news, tips, and latest courses with emails from lynda.com.

Sign up and receive emails about lynda.com and our online training library:

Here’s our privacy policy with more details about how we handle your information.

   
submit Lightbox submit clicked
Terms and conditions of use

We've updated our terms and conditions (now called terms of service).Go
Review and accept our updated terms of service.