Copyright © TIBCO Software Inc. All Rights Reserved
Copyright © TIBCO Software Inc. All Rights Reserved


Chapter 2 Working with Projects, Packages, and Processes : Comparing Different Versions of a Process Package

Comparing Different Versions of a Process Package
You can compare the local Process Package you are working on with another version.
This can be used to identify:
See Source Control for more information using source control to manage your processes.
Performing a Two-way Compare
You can compare your current local copy of the Process Package with a previous local revision.
1.
2.
Select Team > Show Local History. This will show you a list of your revisions to the file.
3.
The default is to keep local history available for 7 days. If you need to see more history than this, select Window > Preferences > General > Workspace > Local History and edit the settings.
4.
You can then compare the file you selected with your current local copy. The Process Package Comparision Editor is displayed showing you a tree of elements that are different in the two files. This is a two-way compare. In the Process Package Structure Compare window at the top of the screen, expand the Process Package and select the level you are interested in (for example, Activities).
The left/right revision views are populated with the tree structure of the different descendents of that element.The differences in your local copy will be shown in the left-hand column.
Using the Process Package Comparison Editor with a Two-way Compare
The following notes will help you interpret the results of a two-way compare. The screenshot below shows you an example of a two-way compare.
As no common ancestor is available for comparison, all differences are treated as if changes were made on the left hand revision):
 
Items that do not have an icon by them are changed in either the left or right hand revision, or both (or have added, deleted or changed descendents).
In a two-way compare is it not possible to identify which version the change was made in.
Performing a Three-way Compare
A three-way compare is used to compare your changes to a Process Package with those of another user, as well as with the original (common ancestor) file on which both are based.
Typically, you might want to do this if another user checked a process package out of Subversion when you did, and they made changes and checked them back in. When you go to check your own version back in, Subversion identifies a potential conflict. To identify areas which the other user has changed and decide whether to adopt their changes and abandon yours, or overwrite them with your own, you can do a three-way compare.
See Source Control for information about using source control to control your project information.
To do a three-way compare (when you have checked a project file out of the source repository and made changes and saved them - and another user has done the same and commited their changes):
1.
You will discover that your changes conflict with those of another user and you will not be able to commit your changes until you have rectified this.
2.
Select Open in Compare Editor to identify whether you want to adopt the changes from the other user, or commit your own changes instead.
Using the Process Package Comparison Editor with a Three-way Compare
The following notes will help you interpret the results of a three-way compare.
 
In a three-way compare, you can distinguish whether an additional element was caused by an addition by someone else or a deletion by you. This is because the comparison can check whether the additional element existed in the common ancestor, and if it did not, then you will know whether you have changed it or whether it was another user.

Copyright © TIBCO Software Inc. All Rights Reserved
Copyright © TIBCO Software Inc. All Rights Reserved