Tutorials

Orcanos Baseline management tutorial – managing branches, software patches

OVERVIEW

Orcanos uses the 2 digits version for baseline management. It means you can login to PROTECT A version 1.0, you can open version 2.0 to be based on 1.0 (which is a direct continuation of 1.0), then move to 2.1, 3.0, 4, etc.

Login to each version will show the delta of the previous one

More details about baseline management

But what about branches?

If you are in version 1.0, and you have opened 2.0, but wish to start a branch from 1.0, later on to be merged with 2.0?

Due to the complexity of automating such event, the branch management shall be manual

In this article, we will show you how to simulate branches manually

BRANCHING IN ORCANOS

The best way to handle the branch is to use a folder in the tree, and the third digit of the version field (3.1.5.23). It’s not mandatory if this digit is in use

Means if you have content that is relevant for a branch in this case, where 1.0.1 is branched from 1.0:

1.0 –> 2.0

–>1.0.1 (Branch)

create a folder in 1.0 view called Branch_1.0.1

Put all changes there

Mark the third digit of the version for each item you add in this folder

When you login to 2.0, you still see this content, but you can disregard it

It’s OK if this is new content, but it creates an issue when a requirement of 1.0 is branched, and you still want to keep 1.0 view and have also 1.1 view (so we cant use Orcanos branch operation and branch the requirement. If that is not the case, and you don’t have to keep the 1.0 view intact, you can just go on and branch the items)

So, in case of a change, also add the change in this folder and link it to existing items

Once you are done with the changes, you can manually merge them in the following way:

  • Take changes from that folder, and apply them to 1.0 view, to be reflected in 2.0. you can play with the branch to separate content between 1.0.1 and 2.0.
  • Keep changes in the folder, which is also seen in 2.0 and work on that folder

 

 

 

 

Related Articles