Skip copyright in mscgen figs

Suggest to add the option to skip copyright marker for mscgen figures.

requested review from @fevold

assigned to @phuyalu

approved this merge request

unapproved this merge request

Please submit a new merge request containing only the Skip_Copyright_in_Mcsgen_figs. I don't want to modify the version of 38.331 in the main branch since it's the clean example, upon which other CRs were based. Details on merging, and the hierarchy of branches will be part of the discussion.

Well, I did indeed create those two CRs separately using completely different branches. I didn't do the merge of changes myself. So, why is it showing as both changes being part of one CR?

Does this mean that if I created branch1 to create a CR1, and pushed it, then created branch2 to create CR2, then the CR2 will contain the changes from both CR1 and CR2? If that is the case how to avoid that -- do I need to be careful when I create branch2 for CR2 in/from my local repo?

Ah, maybe the merge requests are set to be automatic in the default configuration. This is my view.

I figured out the issue. The second branch, which skips the copyright in mscgen figures was based on the first new branch, so the mscgen branch includes the changes of the first branch. To prevent this behavior, change to the base branch before creating a new one. In this example, I think the procedure you followed was as follows.

1. Started in the main branch
2. git checkout -b Missing_Inequalities_D1-X_in_38331-i00
3. Modify 38331-i00.md
4. git add 38331-i00.md
5. git commit -m 'Adding missing inequalities D1-1, D1-2, D1-...'
6. git push origin Missing_Inequalities_D1-X_in_38331-i00
7. git checkout -b Skip_Copyright_in_Mscgen_figs
8. Modify scripts/msc_to_img.lua
9. git add scripts/msc_to_img.lua
10. git commit -m 'Add the option --nocopyright in mscgenToPng...'
11. git push origin Skip_Copyright_in_Mscgen_figs

The resulting structure is shown below. You can see that the "Skip_Copyright" branch is based on "Missing_Inequalities", which means that "Skip_Copyright" contains the commit from the "Missing_Inequalities" branch.

To avoid the problem, add a step between 6 and 7 above.

Step 6.5: git checkout main (or whichever branch is the intended base).

Ok. Covered by !3 (merged), this is closed.

closed