RTC – Source Control Management Alex Chen

SCM Basic Terminology Repository : The repository stores objects such as streams, work items, and workspaces that help manage change flow. It also stores controlled artifacts that represent, and can be retrieved as, files or folders in a computer file system. Repository workspaces : A repository workspace is a repository object that stores items that have been placed under source control. Local workspaces : Local workspaces are directories in your computer's file system, like Eclipse workspace. Stream : A stream is a repository object that includes one or more components. Streams are similar to the branches found in other source control management systems, but have a number of additional capabilities. Component : A component is a collection of related artifacts, such as an Eclipse plug-in or a group of documents that comprise Web site content. Change set : A change set is a repository object that collects a related group of file, folder, and component modifications so that they can be applied to a flow target (workspace or stream) in a single operation. Component baselines : A baseline is a repository object that provides an immutable record of the configuration of a component in a particular workspace or stream. Workspace snapshots : A snapshot is a repository object that includes exactly one baseline for each component in a repository workspace.

SCM Core Concept

SCM Anatomy Stream Repository Workspace Local Workspace Your changes Other’s changes Streams are for sharing resources A repository workspace is your personal space in the repository Local workspaces are where you edit resources Changes flow back and forth NOTE: Speak in general terms with regard to change flow when animating this slide. The technical details and discussions of the actions are coming up. NOTE: We will be mapping the RTC terms to CC terms in the next module if the question comes up on this slide or any of the following slides. Note that blue is server and green is client Also note the icons These conventions will be used throughout the SCM charts There is a 6 click animation on this slide. 1st – shows the stream object and bullet 2nd – shows the repository workspace object and bullet A repository workspaces is your personal space on the server but they are searchable by others and others can get changes from them. 3rd – shows the Local workspace object and bullet Examples of local workspaces include Eclipse workspaces, Visual Studio workspaces and build machine file areas 4th – shows the changes bullet and runs the outgoing changes animation (if you hit page up after it runs and then click again, it will rerun) 5th –runs the incoming changes animation (if you hit page up after it runs and then click again, it will rerun) 6th – shows the final bullet and the icon in the upper right. This icon will be used on other slides to remind us of this relationship.

Typical Journey For a Change Set 3. Complete (usually combined with deliver) 4. Deliver Stream Component Repository Workspace Component 2b.Change set 2a. Check-in A quick animated change flow overview with the screen shots to show the annotations. Note that Check-in can be made automatic after a save via the preferences. Local Workspace 1. Change

SCM Multi-Stream

SCM Best Practices Jazz SCM supports agile best practices Refactoring tracking enables aggressive/agile refactoring Private versions Easy collaboration on change sets Attach to work item Delivery rules Suspending changes

SCM References Managing source code with Rational Team Concert Getting Started with Jazz Source Control Jazz Source Control - Resolving Conflicts Multiple Stream Development Jazz Source Control FAQ