Skip to main content
Completed

Fill trunk code history in branches and reverse

Related products:Software Factory
  • November 4, 2019
  • 4 replies
  • 157 views
Harm Horstman
Mark Jongeling
Geurt
+7
  • Harm Horstman
    Harm Horstman
  • Mark Jongeling
    Mark Jongeling
  • Geurt
    Geurt
  • Edwin van de Peppel
  • HJ van Dalfsen
  • Blommetje
    Blommetje
  • Marc Ferket
  • tim
  • Marius Korff
    Marius Korff
  • andyboerleider
  • Jaycee_C
  • SDjojowiardjo

Currently code history will not be filled with trunk code history by creating a branch. It would be nice if this was possible. This way you can easily do a WinMerge between versions. For example in picture 2 I cannot easily do a WinMerge between 1.11 (trunk) and 1.20 (branch).

While checking the code history detail, I found out that the detail only shows data of the selected (version selector) project_id. So maybe that is the reason why you cannot see this data in that screen. A possible solution is to copy the last trunk code history record as version 1.00 of the branch while creating the branch.

I also found out that trunk code history will not be filled with branch code history after the merge. This is even easier to fix, because you already know to which trunk version you are going to merge. So you can fill originated in project with the trunk project_id and originated in version with the version that is going to arise after merging to trunk.

 

Picture 1

 

 

Picture 2

 

Did this topic help you find an answer to your question?

4 replies

Serhat Sahin
Apprentice
Forum|alt.badge.img+1
  • Apprentice
  • 7 replies
  • November 7, 2019

Hey Ricardo,

That's a solid points you're making. In fact, that's exactly how it's supposed to work. Currently there are some known issues concerning the code history in combination with branching and merging. We are working on a fix and we'll roll this out as soon as we can.

Thanks for your suggestion!


  • 82 replies
  • November 12, 2019

Is this another subject than the code history that is removed on purpose, while only retaining code history that is related to a change log item, thus preventing clutter caused by multiple microedits to the code?


Jasper
Superhero
  • 678 replies
  • January 16, 2020

This will be available in the 2020.1 release.


Forum|alt.badge.img+3
  • Author
  • 5 replies
  • April 24, 2020

That's great. Thank you!


Reply


Cookie policy

We use cookies to enhance and personalize your experience. If you accept you agree to our full cookie policy. Learn more about our cookies.

 
Cookie settings