Evaluation Guide

This is the first screen you're going to see once the Plastic SCM client starts up.
We're going to create a new "project".

I created a new repository called "quake" on my "localhost:8087" which is the server we just installed.

By default, Plastic will assign to the new workspace the same name you use to the repository, and a path on disk for the workspace.

Click "OK" to go create the repository and the workspace:

And then you've your workspace (working directory) and new repo up and running:

1 Go to the Branch Explorer and you will see a diagram like the one below.
It contains the new changesets (ellipses) and labels that you have just pulled from the remote repository. We only pulled the "main" branch so far.

2 Now click the "options" button. Then go to "replication sources" and click the server demo.plasticscm.com.

The Branch Explorer will get updated with new branches coming from the remote server.

They are not pulled but they are still rendered and you can diff the remote branches and changesets.

1 We're going to create our first branch. Right click on the label "Baseline109". Click "Create branch from this label". We're going to create a branch named "bugfix4001". And don't forget to switch your workspace to the new branch.

2 Now we're going to change a file on the new branch "bugfix4001". In order to do that we're going to do two things:

• We're going to move the file "common\FileSystem.cs" to "libs\cmdlib\FileSystem-Renamed.cs". As you see we're moving the file to a new location and also renaming it.
• Then we're going to modify the file: look for the line where it says "count_ = 400;" and change it by "count_ = 350;" as you can see in the image below.

The screenshot shows you the pending changes view with the file that has been modified and also moved and renamed.
Finally type a comment and checkin your changes.

3 Once we've created our first branch and the first checkin, we're going to create a second change to force a merge conflict.

• Create a new branch named "bugfix4002" also starting from "Baseline109".
• And switch to it.

4 Now that we are at "bugfix4002" branch let's do the following:

• Move the file "common\FileSystem.cs" to "art\FileSystem.cs"
• Edit the file and locate the same line that we modified on the previous branch. Now it should be modified as follows: "count_ = 250" (check the screenshot below).
• Checkin your new change.

As you can see we've forced a 'divergent move scenario' which means the same file has been moved in parallel to two different locations.
To make things even worse the file has also been modified.
This scenario means really big trouble for almost all other version control systems, but Plastic SCM can handle it correctly.
Check the MergeMachine documentation for more information about all the supported merge scenarios.

5 Now we're going to merge from "bugfix4001" into "bugfix4002". In order to do that:

• Go to the Branch Explorer.
• Right click "bugfix4001".
• Select "merge from this branch".
• Then a new tab with the merge will be displayed (very similar to the one in the screenshot below).

Plastic SCM detects a "divergent move conflict" as we expected.
Now click "Choose" in the "Resolution method" column in the "Divergent move conflict" and a dialog like the one in the screenshot will show up.
Here you can choose how to solve the conflict.
We will keep the “source” contributor which means we will keep the move done in “bugfix4001”.
It means that the file will be moved to "/libs/cmdlib" and renamed to "FileSystem-Renamed.cs".

Note: do not forget to follow these instructions precisely in order to complete the exercise correctly and qualify for the awesome Plastic SCM T-Shirt :-)

6 Look carefully in the "merge tab" and you will find an "explain merge" button. Click it and you will see a diagram like the one on the screenshot below.

It explains which ones are the 3 contributors on the merge: the 'source' (or theirs), the 'destination' (or yours) and also the 'base' (a.k.a. 'common ancestor').

7 Now go back to the "merge tab" and click on "Process all merges". Once the directory conflict was solved, Plastic SCM will try to solve the file merge.
Remember that the file "FileSystem.cs" was not only moved but also modified.
So when you run "Process all merges" the built-in 3-way merge tool will be launched.
It shows the following information:

• Left panel shows the 'source' revision, the revision coming from branch "bugfix4001".
• The center panel shows how the file was prior to the two modifications performed in parallel. Actually, the content of the file in the label "Baseline109".
• The right panel shows the 'destination' or how the file is on the destination branch, this time "bugfix4002".
• The panel in the bottom shows the 'result' of the merge.

You can click the 'blue', 'yellow' or 'green' buttons to select the right contributor for the conflict (remember, the line with "count_ = ").
In order to complete the exercise correctly, please make sure you keep the change containing the line "count_ = 350;".
Then click "Save & Exit" and the merge tool will be closed. Now go to "pending changes" and checkin.
Congratulations, you've completed your first merge cycle with Plastic SCM!

• No other version control system, including the modern DVCS like Git and Mercurial, are able to handle a case like this. They will end up duplicating the divergently modified file.
• This is just a small example of the underlying merge power of Plastic SCM – the merge machine.

1 Now, your Branch Explorer should look like the one below, with the branch "bugfix4001" correctly merged into "bugfix4002":

2 Create a new branch from "bugfix4002" and give it a new name.
The really important step is to fill in the "comment" of the branch with your email address, so we know how to enable the t-shirt claim page in your www.plasticscm.com account.
Click OK to create your new branch:

3 Now, it's time to push your changes back to the "demo.plasticscm.com" server.

• Right click your newly created branch.
• Go to "replication / push branch".
• Type demo.plasticscm.com:38087 as the server to push your branch to.
• Select the "result" repository from the list. Remember the user and password is demo/demo in case you are asked for it.
• Press "Replicate" and you are done!

Now, if the exercise was completed correctly, you will receive an email notification and you will be able to claim your t-shirt from www.plasticscm.com.

Enjoy!