Solved

Changing a Branch-project to Trunk-project

  • 13 August 2019
  • 6 replies
  • 92 views

Userlevel 2
Badge +3
Some time ago we have created a branch from our original application. The original application is live. We have merged the trunk project to the branch and we will soon go live with this new/extended application. When we want to create a branch from this branch we receive a message that this is not supported.
Since the original application will be obsolete anyway, we would like to 'upgrade' our current branch to trunk. Is this possible and if so, how?

We are currently using 2018.3.
icon

Best answer by Anne Buit 14 August 2019, 15:29

Hi Hugo,

That does complicate things a bit.

You can run the following query on the 2018.3 Software Factory database to change the branch into a project that can be used as a trunk.

code:
update project
set branch_project = 0,
trunk_project_id = null,
trunk_base_project_vrs_id = null
where project_id = 'NAME_OF_BRANCH_PROJECT'
View original

6 replies

Userlevel 5
Badge +2
Hi Hugo,

This is technically possible. But before we go down this road, isn't it easier to merge the branch back to the trunk and continue from the updated trunk?
Userlevel 2
Badge +3
Hi Anne,

Yes, that would be a good (and simple) solution. I suppose we could decide all conflicts in favour of the branch. Would in that case the new trunk be 100% equal to the branch?
Userlevel 5
Badge +2
Hi Hugo,

Yes, this should be the case, if no changes have been done to the trunk since you merged the trunk to the branch.
Userlevel 2
Badge +3
Hi Anne,

We did change a few things in the trunk which we also changed in the branch. But in the mean time we upgraded the branch to 2018.3 where the trunk is still 2018.2. The projects are in 2 different SF's...we did not plan on merging them again.
Userlevel 5
Badge +2
Hi Hugo,

That does complicate things a bit.

You can run the following query on the 2018.3 Software Factory database to change the branch into a project that can be used as a trunk.

code:
update project
set branch_project = 0,
trunk_project_id = null,
trunk_base_project_vrs_id = null
where project_id = 'NAME_OF_BRANCH_PROJECT'
Userlevel 2
Badge +3
Thanks for the help, we changed the project to trunk.

Reply