issue-#100 Controls documentation

User avatar
Josef Templ
Posts: 2047
Joined: Tue Sep 17, 2013 6:50 am

Re: issue-#100 Controls documentation

Post by Josef Templ »

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
Ivan Denisov
Posts: 1700
Joined: Tue Sep 17, 2013 12:21 am
Location: Russia

Re: issue-#100 Controls documentation

Post by Ivan Denisov »

All can be done easier. We need just backup new docu file, recreate branch and copy it back. Then we can commit this new file to repository and push.
Ivan Denisov
Posts: 1700
Joined: Tue Sep 17, 2013 12:21 am
Location: Russia

Re: issue-#100 Controls documentation

Post by Ivan Denisov »

New version pushed.

http://redmine.blackboxframework.org/pr ... d114f33298

http://blackboxframework.org/unstable/i ... c1.592.zip

Everybody who have a local clone of github blackbox repository need to remove issue-#100 and then pull it again or to make new full clone of repository.
User avatar
Josef Templ
Posts: 2047
Joined: Tue Sep 17, 2013 6:50 am

Re: issue-#100 Controls documentation

Post by Josef Templ »

Ivan Denisov wrote:All can be done easier. We need just backup new docu file, recreate branch and copy it back. Then we can commit this new file to repository and push.
Ivan, this is exactly what I told Doug to do, isn't it?
Where do you see a simplification?

- Josef
User avatar
DGDanforth
Posts: 1061
Joined: Tue Sep 17, 2013 1:16 am
Location: Palo Alto, California, USA
Contact:

Re: issue-#100 Controls documentation

Post by DGDanforth »

Ivan Denisov wrote:Doug, you got some negative emotions about git. That is not good.
I am suggest to start from the scratch later, because all this confusion appears because Josef forcing you to fix commit message just after you make your first commit.
Now we will fix this history and all Center members who keep repository mirror will make the new clone.
I will also clean this topic from Git tutorial.
Ok?
Ivan, so you will do the clean up of issue-#100. ?
If so then I will not follow what Josef wrote and let your changes stand.
Please tell me the status of issue-#100.

-Doug
Ivan Denisov
Posts: 1700
Joined: Tue Sep 17, 2013 12:21 am
Location: Russia

Re: issue-#100 Controls documentation

Post by Ivan Denisov »

Doug, I put the file you prepared in single commit with a description following our bidirectional traceability rules. So now it is ready for voting.
Ivan Denisov
Posts: 1700
Joined: Tue Sep 17, 2013 12:21 am
Location: Russia

Re: issue-#100 Controls documentation

Post by Ivan Denisov »

Josef Templ wrote:
Ivan Denisov wrote:All can be done easier. We need just backup new docu file, recreate branch and copy it back. Then we can commit this new file to repository and push.
Ivan, this is exactly what I told Doug to do, isn't it?
Where do you see a simplification?
It is not obvious for new user of git. So I helped Doug a bit. It takes a year from me to get into this git stuff so I can easily manipulate branches and commits :) so I think, that you should not be so strict. I will move all this conversation to archive soon. Today I am really tied already.
User avatar
Josef Templ
Posts: 2047
Joined: Tue Sep 17, 2013 6:50 am

Re: issue-#100 Controls documentation

Post by Josef Templ »

Sorry, Doug, after many days of preparation you were only minutes from success.
Maybe Ivan gives us a chance to do another educational bug fixing session later:-)
User avatar
DGDanforth
Posts: 1061
Joined: Tue Sep 17, 2013 1:16 am
Location: Palo Alto, California, USA
Contact:

Re: issue-#100 Controls documentation

Post by DGDanforth »

Ivan Denisov wrote:Doug, I put the file you prepared in single commit with a description following our bidirectional traceability rules. So now it is ready for voting.
Ivan, thank you.

As I understand it we already voted on issue-#100.
In an unrestricted redmine I would think a new issue would be needed to the Controls documentation change.
But since redmine restricts the issue numbers, I guess, it is OK to resuse the number and again
vote on issue-#100.

I'll create the vote now.

-Doug
User avatar
Josef Templ
Posts: 2047
Joined: Tue Sep 17, 2013 6:50 am

Re: issue-#100 Controls documentation

Post by Josef Templ »

Even in an unrestricted Redmine this would be the same issue.
Post Reply