Concurrent Versioning System

1
Concurrent Versioning System

• Chapter 8 (ALBINGs)

2
Steps to Access a CVS server

• Select the CVS Repository Exploring perspective
• Right click in the CVS Repositories view
• New
• Repository Location
• Fill form
• Host maple.computing.csbsju.edu
• Repository path /home/csv/CS230
• User YOUR USERNAME
• Password YOUR PASSWORD
• Connection type extssh
• Check Validate connection on finish

3
Importing a Project to CVS

• In Java perspective, right click on project
• Team
• Share Project
• Select CVS location
• In the Share Project Resources
• Highlight the files or folders that your want to
  share
• Press Ctrl key while selecting
• Right click
• Commit
• Add comment This is project X release Y

4
Importing a Project to CVS

• Can instruct CVS to ignore files and folders in
  the given project using its .cvsignore
• MUST MAKE THIS SELECTION BEFORE YOUR COMMIT
• Highlight files to be ignored
• Right click on them
• Select add to .cvsignore
• Notice the .cvsignore file added to the parent
  folder containing the ignored resource (s)
• Can be edited
• Note that each subfolder must have its own
  .cvsignore file ? if you need to ignore resources
  having the same name but in subfolders ? step
  must repeated for individual subfolders
• Dont ignore the .project file

5
Checkout a Copy from CVS

• File gt Import
• Checkout Projects from CVS
• Choose the correct CVS location
• Select Use an existing module
• Select Check out as a project in the workspace
• Provide different name if desired
• Check Use default workspace location
• Click on Head
• Click Finish

6
CVS Decorations

• Go to Resource Perspective
• Repository host name
• Each imported project is suffixed with the CVS
  host name
• Files not shared
• A ? overlaid on the file icon
• Files changed locally
• Modified since they were last checked out
• Called dirty files
• Prefixed with a gt sign
• Revisions number
• Appended to each file name
• ASCII vs. Binary
• Changes to ASCII files are tracked line by line

7
Changing between ASCII/Binary

• In the Java Perspective
• Right click on a file
• Team gt Change ASCII/Binary Property
• Under the Change the ASCII/Binary property for
  the selected files
• Choose appropriate type

8
Dealing with Sandbox Changes

• Right click on project
• Team gt
• Synchronize with Repository
• Opens the Team Synchronization
• Gives you the chance to see to all incoming and
  outgoing changes
• Commit
• Commits your sandbox to repository
• Will fail if another user has a committed a
  conflicting change
• Update
• Receives updates to sandbox from repository
• Merges everything together

9
Synchronize with Repository

• Select the Synchronize with Repository option
• Double on the click the you want to synchronize
• In the Synchronize view, can choose between four
  modes
• Incoming
• Shows files changed in the repository that you
  have not yet updated to you sandbox
• Outgoing
• Shows files changed in your sandbox but not
  committed to the repository yet
• Incoming/Outgoing
• Conflict
• Both you and the repository have modifications to
  the same resource.
• Displayed in all modes but this mode displays
  only conflicts

10
Proposed Workflow

• Team Synchronization Perspective
• Exam incoming changes and add them to your
  sandbox
• Right click on project or file
• Select Update
• Resolve conflicts
• Manually to your local source
• Right click on project or file
• Select Override and Update
• Operates on conflicts by replacing your sandbox
  with repository copies
• Discards your local changes
• When done, choose mark as merged from the context
  menu on the file in the Synchronize view (right
  click file)
• Commit changes
• When files are processed successfully they are
  removed from the synchronization perspective

11
Resource History

• Right Click on file in Synchronize View
• Select Show in History
• Or in Other views
• Team gt Show in Resource History
• Youll see
• Revision
• Tags
• Date
• Author
• Comment
• Double click on a any revision to see file
• Row starting with a is the copy that you have
  in your sandbox

12
Tagging Files

• A tag assigns a label to the collection of
  revisions represented by the files in the
  workspace
• To tag a project
• In the Navigator or Package Explorer View
• Select Project
• Team gt Tag as Version
• Enter Name

13
Checkout a Version

• Just as we checked out a project but now choose
  to a version tag instead of Head (trunk)
• Expand Versions and choose tag
• When you check out files using a tag, you cant
  commit changed back to Head
• Other changes have been made after the tag was
  assigned
• Youll get an error if you try to commit
• Can use branching instead

14
Branching

• With branches, changes are independent of Head
• Head is the main branch
• To create a branch
• In the Navigator or Package Explorer View
• Select Project
• Team gt Branch
• Enter Name
• Just as we checked out a version but now choose
  to a branch
• Expand Branches and choose branch
• Changes are committed back to branch