PC SOFT

ONLINE HELP
FOR WINDEV, WEBDEV AND WINDEV MOBILE

Home | Sign in | English US
  • Overview
  • How to proceed?
  • Creating a branch
  • Retrieving the modifications from a branch
  • Notes
WINDEV
WindowsLinuxUniversal Windows 10 AppJavaReports and QueriesUser code (UMC)
WEBDEV
WindowsLinuxPHPWEBDEV - Browser code
WINDEV Mobile
AndroidAndroid Widget iPhone/iPadApple WatchUniversal Windows 10 AppWindows Mobile
Others
Stored procedures
Overview
The management of branches is used to manage several versions of the same application in parallel.
The most common case is as follows: You have deployed a version of your application and you are working on the next version of this application. Meanwhile, you would like to apply the bug fixes performed in the current version to the deployed version, and therefore create and deploy intermediate versions.
Another example: The branches can also be used to manage specific versions for each client. Each branch corresponds to a client version. As soon as the base project (common trunk) is modified, all you have to do is apply the modifications into each one of the branches.
The branches are used to distribute patch versions of the application to customers without any effort: no need to code the same things twice.
The risk of errors due to "manual reporting" disappears.
The comfort increases, the security increases, the hurdles to availability of bug corrections disappear...
Note: The branch modifications are bi-directional. The modifications can be applied from the main project to the branch or from the branch to the main project. The modified project is always the project that is opened. In the rest of this document, the example applies a modification from the main project to the branch.
How to proceed?

Creating a branch

Creating a branch is used to create a copy of the current project in order to perform modifications, additions, ... on two versions of the same project.
For example: creating a branch allows you to prepare a new version of your application while correcting the problems in the deployed version. The main project will be the project corresponding to the new version and the branch project will be the deployed project, in which the bug correction will be performed.
To create a branch:
  1. Open your project.
  2. Select "SCM .. Branches .. Create a branch".On the "SCM" pane, in the "Project" group, expand "Branches" and select "Create a branch".
  3. The wizard for branch creation starts. This wizard allows you to create a copy of the project branch, locally on your computer and in the database of SCM.
  4. Specify a name for the branch. This name can include letters, numbers, ... This name is important because it will be used:
    • to identify the directories of the projects affected by the version,
    • to identify the different versions in the project history, ...
  5. Go to the next step.
  6. Specify the name of directory to create for the branch. By default:
    • a new directory is created in the SCM. By default, this directory is made of "Branches\<Version Name>\<WX Projects>". The SCM project will be duplicated in this directory.
    • a new directory is created locally. This directory is created in "MyProject.Branches\<Version Name>" by default. This directory will contain the local project of the branch.
      Note: The default directory names can be modified in the options of SCM administrator.
  7. Go to the next step.
  8. Specify the comment associated with the branch creation and select the options for creating the branch:
    • Use my local version as reference for the branch: Used to create the branch from the project version found in SCM (recommended) or from the local version.
    • Find and re-create the shares in the branch: Used to re-create all the shares between the different projects of the same branch. Note: this option does not automatically add into the branch the project that have a share. The option re-creates the shares when adding the other projects.
    • Open the new project once the branch is created: Used to directly open the project corresponding to the branch. A new instance of WINDEV, WEBDEV or WINDEV Mobile will be run.
  9. Validate. The specified projects are created locally and in the SCM.

Retrieving the modifications from a branch

If modifications have been performed in a branch, these modifications can be retrieved in the main version of the application.
To retrieve the modifications performed in a branch:
  1. Open the main version of the project.
  2. Select "SCM .. Branches .. Retrieve modifications from a branch". The wizard for applying the modifications is displayed.On the "SCM" pane, in the "Project" group, expand "Branches" and select "Retrieve the modifications from a branch". The wizard for applying the modifications is displayed.
  3. Select the branch containing the modifications to apply.
  4. Select the elements containing the modifications to apply. You can apply:
    • All the modifications.
    • Only the modifications corresponding to some tasks or incidents.
  5. Regardless of the selected element, you can:
    • Apply all the modifications performed ("All" button).Apply all the modifications performed ("Retrieve all" button).
    • Apply all the modifications performed EXCEPT some of them ("All except" button). In this case, you can select the modifications that must not be applied.Apply some of the modifications performed ("Select a part..." button).
    • Apply some of the modifications performed ("A part" button). In this case, you can select the modifications that must be applied.Don't apply the modifications ("No action " button).
  6. The wizard presents the operations that are going to be performed. You have the ability to enter comments: they will be associated with the operation for branch copy.
  7. Validate. Depending on your choices, elements may have to be checked out.
Caution: The elements checked out for modification are not automatically checked back in. Don't forget to check these elements back in.

Notes

  • Sub-branches
    You have the ability to create sub-branches (branch created from a branch).
    The modifications performed in a sub-branch cannot be directly retrieved in the version currently developed. The modifications of the sub-branch must be retrieved in the branch then the modifications of the branch must be retrieved in the version currently developed.
  • Creating a branch thereafter
    You have the ability to create branches on an earlier version of the project by using the history.
    To create a branch thereafter:
    1. Display the project history.
    2. Select the requested history version.
    3. Click the "Create a branch" button.
Minimum required version
  • Version 11
This page is also available for…
Comments
Click [Add] to post a comment