version 1.1.2.5, 2013/06/11 23:17:40
|
version 1.1.2.7, 2013/06/16 13:04:23
|
|
|
| |
NOTES On working with task branch. | NOTES On working with task branch. |
| |
Merge out |
Merge out Process |
I just start with new directory and put TaskMakefile above pegasus |
|
| |
make -f TaskMakefile BNAME=PEP317-pullop ## takes a long time |
To keep our TASK branch in sync with the current head of tree we need |
|
to do a regular merge out. the TaskMakefile contains the makefile |
|
procedures to do this efficiently. NOTE: Following these procedures is |
|
important in that you are merging out new material each time you do |
|
the merge out. If you were just to repeatedly merge out, you would be |
|
merging previously merged changes a second time causing a real mess. |
|
|
|
Start with new directory and put TaskMakefile above pegasus (needed so you |
|
have this file for the initial operations. |
|
|
|
make -f TaskMakefile branch_merge_out BNAME=PEP317-pullop ## takes a long time |
|
|
|
This checks out current head, merges it into task branch and sets tags |
|
for the mergeout. Note that at the end of this step this work is |
|
part of the TASK... branch. |
|
|
|
NOW check for conflicts, errors, etc. that resulted from the merge. |
|
Look for conflict flags, compare the results (I use linux merge as a |
|
good graphic compare tool) and build and test. When you are satisfied |
|
that the merge out is clean, you can commit the results to the TASK... |
|
branch |
| |
checks out current head, merges it into task branch and sets tags |
To commit the work to this into Task branch |
NOW check for conflicts, errors, etc. |
|
|
|
To check this into Task branch |
|
| |
make -f mak/TaskMakefile branch_merge_out_commit BNAME=PEP317-pullop | make -f mak/TaskMakefile branch_merge_out_commit BNAME=PEP317-pullop |
| |
or manually commit and finish as follows | or manually commit and finish as follows |
| |
cvs commit | cvs commit |
|
|
make -f mak/TaskMakefile branch_merge_out_finish BNAME=PEP317-pullop | make -f mak/TaskMakefile branch_merge_out_finish BNAME=PEP317-pullop |
## This last step is important since it cleans up temporary tags. |
|
|
## This last step is important since it cleans up temporary tags to prepare |
|
you for the next checkout |
| |
COMPARE TASKBRANCH WITH HEAD | COMPARE TASKBRANCH WITH HEAD |
| |
In a new pegasus work space do same as for merge out. |
In a new pegasus work space do same as above for merge out. |
| |
make -f TaskMakefile BNAME=PEP317-pullop | make -f TaskMakefile BNAME=PEP317-pullop |
| |
This produces a result which is all of the head merged into the branch. | This produces a result which is all of the head merged into the branch. |
A diff of this is all the new changes to the head of tree. |
A diff of this is all the new changes to the head of tree that you will |
|
include into the merge. |
| |
| |
TODO list: | TODO list: |
|
|
4. The changes to WQLCIMOperationRequestDispatcher and CQL... for handling | 4. The changes to WQLCIMOperationRequestDispatcher and CQL... for handling |
pull not completed so we feed the responses back to the EnmerationContext | pull not completed so we feed the responses back to the EnmerationContext |
queues | queues |
3. Lots of minor TODOs, etc. |
3. Lots of minor TODOs, diagnostics, etc. |
4. External runtime variables. Decide this as part of PEP. The variables | 4. External runtime variables. Decide this as part of PEP. The variables |
exist in CIMOperationRequestDispatcher but not in CIMConfig. The primary | exist in CIMOperationRequestDispatcher but not in CIMConfig. The primary |
ones to consider are: | ones to consider are: |
|
|
8. Still using templates, etc. in code in the Dispatcher. This is for | 8. Still using templates, etc. in code in the Dispatcher. This is for |
all of the open operations where there is a lot of duplicate code | all of the open operations where there is a lot of duplicate code |
and the pull operations that are 99% duplicate code (in a single template) | and the pull operations that are 99% duplicate code (in a single template) |
|
9. NEXT TASK: get the pull operations into a single function by |
|
creating a new CIMPullResponse message in CIMMessage.h that contains |
|
the pull data. Then we can use a single function to process all pull |
|
operations. |
|
|
|
Fixed for 16 June CVS Update |
|
1. Cleaned up the enumerationContext and Table release functions and tested |
|
to confirm that we do not lose memory in either normal sequences or |
|
sequences that close early. Cleaned up pullop and added more tests |
| |
Fixed for 9 June CVS update | Fixed for 9 June CVS update |
1. Cleaned up code for OpenQueryInstances. Note that this is incomplete. | 1. Cleaned up code for OpenQueryInstances. Note that this is incomplete. |