Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Doc: Delete MANUAL.pdf #144

Closed
wants to merge 1 commit into from
Closed

Doc: Delete MANUAL.pdf #144

wants to merge 1 commit into from

Conversation

ludomal
Copy link
Member

@ludomal ludomal commented Nov 6, 2019

This is the 2009 manual. It is no longer necessary, especially because the manual is now automatically generated.

This is the 2009 manual. It is no longer necessary, especially because the manual is now automatically generated.
Copy link
Member

@dennisguse dennisguse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be coming from 'dev'.
Otherwise master and dev could diverge, or?

@ludomal
Copy link
Member Author

ludomal commented Nov 6, 2019

Or maybe we should do it the other way round? Apply it to Master then merge it to dev?
Master should be considered as frozen for the 2019 release (except for this deletion), and it will most likely always be behind dev.

@dennisguse
Copy link
Member

I just always assumed that Dev would always be ahead of master and all accepted changes are merged into master from Dev rather than the other way around. Are there more changes on Dev that should not yet be merged into master?

@ludomal
Copy link
Member Author

ludomal commented Nov 26, 2019

Sorry I have missed your last comment. On this occasion, the source code does not differ between the dev and the master branch. The only difference is on .gitignore and .travis.yml that were updated recently.

However maybe we should settle and write down the procedure, as it is possible that we have differences in the future.

When a new version of the code is submitted to ITU-T, the dev branch will be forked to keep track of the code submitted for standardization (the submission branch) . It usually takes several months for the standard to be ratified, and the documentation and code of that submission may be updated to accommodate requests from ITU-T.
In the mean time, activities on the dev branch may carry on and from that point the code may differ.

Once the new recommendation is approved, the master branch should reflect the code from the submission branch, not the one from the dev branch. Changes from the submission branch should also be incorporated into the dev branch.

What should be the procedure?

@simaocampos
Copy link
Member

simaocampos commented Nov 26, 2019 via email

@dennisguse
Copy link
Member

I created an (long) issue for the discussion: #146

@ludomal ludomal closed this May 27, 2022
@ludomal ludomal deleted the ludomal-patch-2 branch May 27, 2022 17:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants