Publishing changes in an Edit branch

After you create or modify a Data definition, a generator, or a generator category in a project in HCL OneTest Server, you can publish all the changes that are in an Edit branch to the branch in the project repository. After which, other members in the project can view and use the test resources. The Edit branch automatically disappears from the Branch list of the Data page and the changes made to the project are merged into the previously selected branch name.

Before you begin

You must have completed the following tasks:

About this task

When you create or modify multiple assets in a project, the Changes page lists all the changed assets in the selected branch. In this scenario, you cannot publish or discard a single change. You must either publish or discard all changes that are made to all the listed assets. The Changes page also provides you with information about the number of commits that the selected branch is ahead and behind. After you publish an asset to the Git repository, all the other project members who have access to that asset can view the updated asset. You can click the Menu icon in each row of the assets to perform the following actions in the Changes page:

Options Actions
Edit Click Edit to make any updates to the asset before publishing.
Discard Click Discard to remove the changes that you made to the asset.
Save as Click Save as to save a copy of the asset.
Note:

When you try to publish a modified asset with conflicting edits, an error about conflicting changes is displayed. However, you can use the Save as option to save a copy of the asset edits under a new asset name. You must discard the edits that you made to the original asset.

For example, consider a scenario when Amy Smith and John Doe edit the same Data definition, and Amy Smith edits and publishes the Data definition. On the Changes page, a message that indicates the number of commits ahead and behind in the branch is displayed when John Doe tries to publish the same Data definition. You can then use the Save as option to resolve this issue.

Procedure

  1. Log in to HCL OneTest Server.

    The team space that contains your project is displayed.

  2. Click Active projects > My projects > project_name to open the project that contains the test assets.

    The Overview page of the project is displayed.

  3. Go to Author > Changes.
  4. Select the required branch from the Branch list.
    All the updated assets that are present in the selected branch are displayed in the Changes page.
  5. Optional: Click the (n) commits ahead option, and then click Reset beside a commit to revert your changes for that asset.
  6. Optional: Click the (n) commits behind option, and then click Merge to merge the changes made by other members of the project into the selected branch.
  7. Click Publish changes.
    The Publish dialog is displayed.
  8. Enter a description for the changes that you performed to the asset, and then click Publish.
    A notification is displayed for successful pushing of changes to the Git repository.
    Note:

    The edit branch automatically disappears from the Branch list as well as from the remote Git repository and sets the global branch to the previously selected branch. After the edit branch disappears, the Branch field is set to the previously selected branch name.

Results

You published the changes in an Edit branch to the branch in the project repository. The other members of the same project, who have access to the test resource can view and use the test resource.