Base Version Update

What is a base version update?

All changes in Changelogic are isolated from each other and from the main branch. Every change has a base version. So as new changes are integrated or your change is replanned, your base version becomes stale – it doesn't contain new code between your base version and the latest version. VCS update doesn't help here – you live on your own branch, but you can upgrade your base version to the current latest version in the test release cycle where your change is planned.

Updating base version is essentially very similar to integration; here, instead of merging the change into mainline, the edits in mainline are merged into change. As the process includes merging, it is advisable to upload diffs first in order to have diffs browsable for resolving conflicts.

Type ant update_base on command line to start base version update.

When you do base version update, Changelogic client executes the following steps:

uncommitted files in your working directory are committed to VCS
a new checkpoint is marked on the change
a branch is created on top of the checkpoint for the update
the branch is checked out into your integration directory
the difference between current base version and new base version is merged into the integration directory
the merged code in integration directory is committed
integration directory is switched to your change
the update branch is merged into the change in integration directory
the change in integration directory is committed
the integration directory is deleted
your working directory is updated

Usually these steps are carried out automatically. If the script fails, it will be most probably due to conflicts that need resolving in integration directory. Resolve the conflicts and run ant update_base_continue to continue base version update.

In case you change your mind and want to keep the old base version, you can stop base version update by issuing command ant update_base_cancel.

The base version cannot be updated if the base version of your change is already the latest version of the planned test release cycle.