Simply leave it closed.
It is included in the change list if it is closed
and you don't have to close it again before the merge.
- Josef
issue-#142 adding a disassembler to the ocf importer
- Josef Templ
- Posts: 2047
- Joined: Tue Sep 17, 2013 6:50 am
Re: issue-#142 adding a disassembler to the ocf importer
Slight misunderstanding here - didn't close it. So it is missing from build 808 changes list.Josef Templ wrote:... and you don't have to close it again before the merge.
Fixed in build 809.
- Josef Templ
- Posts: 2047
- Joined: Tue Sep 17, 2013 6:50 am
Re: issue-#142 adding a disassembler to the ocf importer
just noticed that the docu file name DevDecode386 had a small typo.
Should be DevDecoder386.
Also a segment register has not been written in a special mode.
Fixed both.
Please see diffs at https://redmine.blackboxframework.org/p ... 97faa7e691.
- josef
Should be DevDecoder386.
Also a segment register has not been written in a special mode.
Fixed both.
Please see diffs at https://redmine.blackboxframework.org/p ... 97faa7e691.
- josef
Re: issue-#142 adding a disassembler to the ocf importer
Why is not the fix about segment register in the last BlackBox link 850?Josef Templ wrote:just noticed that the docu file name DevDecode386 had a small typo.
Should be DevDecoder386.
Also a segment register has not been written in a special mode.
Fixed both.
Please see diffs at https://redmine.blackboxframework.org/p ... 97faa7e691.
- josef
- Helmut
-
- Posts: 1700
- Joined: Tue Sep 17, 2013 12:21 am
- Location: Russia
Re: issue-#142 adding a disassembler to the ocf importer
Josef made this fix in the topic branch and then we not merged it...Zinn wrote:Why is not the fix about segment register in the last BlackBox link 850?
https://redmine.blackboxframework.org/p ... sue-%23142
Let's merge to master or vote and then merge. I suggest Robert review and decide the necessity of voting.
Re: issue-#142 adding a disassembler to the ocf importer
It looks like we have already agreed the technical content, but there has been an administrative error.Ivan Denisov wrote:Josef made this fix in the topic branch and then we not merged it...Zinn wrote:Why is not the fix about segment register in the last BlackBox link 850?
https://redmine.blackboxframework.org/p ... sue-%23142
Let's merge to master or vote and then merge. I suggest Robert review and decide the necessity of voting.
I suggest:
- Someone (Ivan ?) updates the master.
- They post a link to the diff
- If anyone objects we can reconsider the way forward.
-
- Posts: 1700
- Joined: Tue Sep 17, 2013 12:21 am
- Location: Russia
Re: issue-#142 adding a disassembler to the ocf importer
Josef found this typo and bug (Fri Mar 17, 2017 10:24 pm) after vote passed (Thu Mar 16, 2017 3:52 am).
We just not proceeded this correctly. Actually I do not know how to do in such cases. We have the rule that any commit to the master branch should be voted. However if vote for any typo it will be administrative overhead... I think that for such cases chairperson should decide what to do.
Robert, we can just create pull request and then merge as usual:
https://github.com/BlackBoxCenter/black ... 2?expand=1
After voting or without voting.
We just not proceeded this correctly. Actually I do not know how to do in such cases. We have the rule that any commit to the master branch should be voted. However if vote for any typo it will be administrative overhead... I think that for such cases chairperson should decide what to do.
Robert, we can just create pull request and then merge as usual:
https://github.com/BlackBoxCenter/black ... 2?expand=1
After voting or without voting.
Re: issue-#142 adding a disassembler to the ocf importer
Yes, if I understand correctly, that is what I just did with the two missing Strings lines for Math.SinCos.Ivan Denisov wrote:Robert, we can just create pull request and then merge as usual:
...
After voting or without voting.
I think the person handling the issue can do this without voting provided:
1 - It is a very minor correction to a topic that has recently been approved
2 - They warn the community a day before doing it
3 - They post the diffs after doing it
4 - If anyone objects we revert the change and go to a vote.
-
- Posts: 1700
- Joined: Tue Sep 17, 2013 12:21 am
- Location: Russia
Re: issue-#142 adding a disassembler to the ocf importer
No, SinCos you pushed to master directly. In that case Josef pushed this changes to issue-#142 branch. So we can merge through GitHub interface.Robert wrote:Yes, if I understand correctly, that is what I just did with the two missing Strings lines for Math.SinCos.Ivan Denisov wrote:Robert, we can just create pull request and then merge as usual:
...
After voting or without voting.
Re: issue-#142 adding a disassembler to the ocf importer
The name of DevDecode(r)386 in the Docu directory is also not fixed in link 850.
After this discussion do you remember what else was not fixed in 850?
- Helmut
After this discussion do you remember what else was not fixed in 850?
- Helmut