Re: issue-#100 Controls documentation
Posted: Mon Jul 25, 2016 1:02 pm
I agree with Ivan.
The topic branch can be repaired manually, i.e. set up again and the required file changes can be redone.
There are not many files affected, so that would be possible.
In Github, I see that this branch is 4 commits ahead of master, and all of the 4 commits are related to Controls docu.
So there is only a single file to fix.
Ivan, could you check this?
Doug, you should not give up so quickly.
Now you are through the painful setup process and you know how it works.
There is not much more.
Actually, you are able to repair the branch yourself!
Well, almost.
The only step that is (probably) new is the creation of a new topic branch named issue-#100 on https://github.com/BlackBoxCenter/blackbox.
Therefore the old issue-#100 must be removed first (on Github!, leave it unchanged on you local machine).
See 'Topic Branches' in http://wiki.blackboxframework.org/index ... p_with_Git
for the details on creating a new branch.
Then you clone the repository with Branch set to issue-#100 into a new folder.
Then you copy the changed Controls docu file from where it was into the new clone.
Then you commit into the clone and then you push the new clone.
It will not take more than 10 minutes including the reading of the wiki.
After that the only missing piece is how to generate a diff from Redmine.
For that you go to http://redmine.blackboxframework.org/projects/blackbox,
log in, and select 'Repository' and the related 'Branch'. Then you see a list of commits to this branch.
This is the redmine mirror. Its task is to produce Ascii diffs for binary BB files.
You only see changes that have been pushed to the selected topic branch on github.
Therefore this diff feature cannot be used for your local changes.
(Therefore the DiffConfig package exists.)
You can set the radio buttons to the two revisions that should be compared.
Then click View Differences. The URL can be used to refer to the diff.
- Josef
The topic branch can be repaired manually, i.e. set up again and the required file changes can be redone.
There are not many files affected, so that would be possible.
In Github, I see that this branch is 4 commits ahead of master, and all of the 4 commits are related to Controls docu.
So there is only a single file to fix.
Ivan, could you check this?
Doug, you should not give up so quickly.
Now you are through the painful setup process and you know how it works.
There is not much more.
Actually, you are able to repair the branch yourself!
Well, almost.
The only step that is (probably) new is the creation of a new topic branch named issue-#100 on https://github.com/BlackBoxCenter/blackbox.
Therefore the old issue-#100 must be removed first (on Github!, leave it unchanged on you local machine).
See 'Topic Branches' in http://wiki.blackboxframework.org/index ... p_with_Git
for the details on creating a new branch.
Then you clone the repository with Branch set to issue-#100 into a new folder.
Then you copy the changed Controls docu file from where it was into the new clone.
Then you commit into the clone and then you push the new clone.
It will not take more than 10 minutes including the reading of the wiki.
After that the only missing piece is how to generate a diff from Redmine.
For that you go to http://redmine.blackboxframework.org/projects/blackbox,
log in, and select 'Repository' and the related 'Branch'. Then you see a list of commits to this branch.
This is the redmine mirror. Its task is to produce Ascii diffs for binary BB files.
You only see changes that have been pushed to the selected topic branch on github.
Therefore this diff feature cannot be used for your local changes.
(Therefore the DiffConfig package exists.)
You can set the radio buttons to the two revisions that should be compared.
Then click View Differences. The URL can be used to refer to the diff.
- Josef