Harvest

 View Only
  • 1.  E03020150 Merge error

    Posted Sep 26, 2022 08:45 AM
    Hi,

    I have a package with 2 items. When I attempt to merge all items in the package, one of them fails with this message:

    ---------- Begin  <Merge Files>  Process ---------------
    E03020150: The item NOCL_MAINT_IMRT.pll has an unmerged branch version in the merge package.
    ---------- End  <Merge Files>  Process ---------------​

    I'm attaching an image of the package with its two items as well. 
    Package with its items

    I don't understand why this item is different. The user can also not explain to me exactly what actions he took on the item.

    Any idea why I'm getting this error?


    ------------------------------
    Jarus Bosman
    Senior Software Developer
    State Information Technology Agency
    South Africa
    ------------------------------


  • 2.  RE: E03020150 Merge error

    Broadcom Employee
    Posted Sep 26, 2022 09:32 AM
    Hi Jarus,

    Thanks for reaching out to us

    Observations :

    1.NOCL_MAINT_IRTC_fmb

    Say pack 1 - 0.1.1,0.1.2,0.1.3

    We see that there are other versions 0.2.1 ,0.3.1 and 0.4.1

    These versions must be created using other packages (example names used below)

    say pack2 - 0.2.1
    pack3 - 0.3.1
    pack4 - 0.4.1

    2.To find out how these versions are created ,you can use version history. Right click on the item 0.4.1 and execute VERSION HISTORY. You may post us the result.

    3.Are you executing CONCURRENT MERGE on the package INC000000681730 and seeing this error.?

    4.You may have used SWITCH PACKAGE process to fetch these versions from other packages to this package (Please confirm the same)

    5.You need to execute CONCURRENT MERGE process on all these packages .

    Below is the sample workflow to merge BRANCH versions into the TRUNK .See the below example for better visualization

    Pack 1 - 0.1.1. 

    Pack 2 - 0.2.1

    Pack 3 - 0.3.1

    Execute CONCURRENT MERGE on Pack 1 - 1 (N) tag is created

    Execute CONCURRENT MERGE on Pack 2 - 2 (M) tag is created ( 1 and 0.2.1)

    M-tag needs to be resolved here to create 2 (N) tag

    Execute CONCURRENT MERGE on Pack 3 - 3 (M) tag is created ( 2 and 0.3.1)

    M -tag needs to be resolved here to create 3 (N) tag

    Please review above information and let us know where we can help you.

    Regards,
    Balakrishna


  • 3.  RE: E03020150 Merge error

    Broadcom Employee
    Posted Sep 26, 2022 09:44 AM
    Hi Jarus,

    PLEASE IGNORE the previous message...


    Hi Jarus,

    Thanks for reaching out to us

    Observations :


    1. MOCF_MAINT_IRTC.fmb


    have versions 0.1.1,  0.1.2, 0.1.3 ,0.1.4 reside in the above package which mean they are created from the same package

    NOCL_MAINT_IMRT.pll


    We see that there are other versions 0.2.1 ,0.3.1 and 0.4.1 for this item That means they are created from different packages



    2.To find out how these versions are created ,you can use version history. Right click on the item 0.4.1 and execute VERSION HISTORY. You may post us the result.

    3.You seem to be executing CONCURRENT MERGE on the package INC000000681730 and seeing this error


    These below suggestions are based on our understanding. Please review the same more thoroughly

    4.You need to execute CONCURRENT MERGE process on all these packages where branches 0.2.1 ,0.3.1 and 0.4.1 reside

    Below is the sample workflow to merge BRANCH versions into the TRUNK .See the below example for better visualization

    Pack 1 - 0.1.1.

    Pack 2 - 0.2.1

    Pack 3 - 0.3.1

    Execute CONCURRENT MERGE on Pack 1 - 1 (N) tag is created

    Execute CONCURRENT MERGE on Pack 2 - 2 (M) tag is created ( 1 and 0.2.1)

    M-tag needs to be resolved here to create 2 (N) tag

    Execute CONCURRENT MERGE on Pack 3 - 3 (M) tag is created ( 2 and 0.3.1)

    M -tag needs to be resolved here to create 3 (N) tag

    Please review above information and let us know where we can help you.


    Regards,
    Balakrishna





  • 4.  RE: E03020150 Merge error

    Posted Sep 27, 2022 02:53 AM
    Hi Balakrishna,

    Thank you for the clarification.

    I can't find a "Version History" option on the context menu, but here is the History Diagram:

    History Diagram
    It looks like all changes were made by the same user on the same package, so I don't know where else to perform any merges?

    Kind regards,
    Jarus


    ------------------------------
    Jarus Bosman
    Senior Software Developer
    State Information Technology Agency
    South Africa
    ------------------------------



  • 5.  RE: E03020150 Merge error

    Broadcom Employee
    Posted Sep 28, 2022 08:17 AM
    HI Jarus,

    Thanks for the response.
    We are reviewing your answer and will get back on this with an update.

    Regards,
    Balakrishna


  • 6.  RE: E03020150 Merge error

    Posted Dec 19, 2022 05:28 AM
    Hi Balakrishna,

    Have you made any progress on this matter?

    Kind regards,
    Jarus

    ------------------------------
    Jarus Bosman
    Senior Software Developer
    State Information Technology Agency
    South Africa
    ------------------------------



  • 7.  RE: E03020150 Merge error

    Broadcom Employee
    Posted Dec 26, 2022 09:59 AM
    Hello Jarus,

    We tried creating versions 0,0.1.1,0.2.1,0.3.1 for a file in single package by choosing take trunk option while merging.

    This option will close the branch. 

    Now if we perform checkin operation of the same file  in the same package, it will create a new branch version as the previous branch is closed.

    This is one of the option where we can see different series of branch versions in same package.

    In our environment  when we tried  merging the package with above created versions, the version is getting merged without any error.

    Can we try creating/merging same file in a different package and check the result?

    For more detailed review of the use case a support case might help us to track all the investigations.

    Thanks,
    Sridhar