(file) Return to readme.pulloperations CVS log (file) (dir) Up to [Pegasus] / pegasus

  1 karl  1.1.2.1         Using the CIM/XML Pull Operations
  2               
  3               STATUS
  4               
  5 karl  1.1.2.4 <<< The TODO section is being maintained during the review and checkin process
  6 karl  1.1.2.1 to keep track of problems, errors, notes, etc.  Must be deleted before
  7               checkin to head of tree. Please feel free to add notes, etc in this
  8               section as you review/test.>>>>>>
  9               
 10 karl  1.1.2.4 TODO list:
 11 karl  1.1.2.3    1. Binary operation from OOP.  Need to add counter to binary
 12                     protocol to be able to count objects in response. Generates
 13                     warnings in things like messageserializer and does not work with
 14 karl  1.1.2.14       OOP right now.  Corrected by converting to XML. 
 15 karl  1.1.2.23    2. OpenExecQuery - Code is incomplete in that it does not include the
 16 karl  1.1.2.15       return from the exec query function to the aggregator yet.
 17 karl  1.1.2.4     3. Code for Pull part of OpenQueryInstancesRequest a) should be part of
 18                      the common CIMOperationRequestDispatcher execCommon code.
 19                   4. The changes to WQLCIMOperationRequestDispatcher and CQL... for handling
 20                      pull not completed so we feed the responses back to the EnmerationContext
 21                      queues
 22 karl  1.1.2.18    3. Lots of minor TODOs, diagnostics, etc. still in the code
 23 karl  1.1.2.14    4. External runtime variables. Proposing that they be fixed for this release
 24 karl  1.1.2.15       rather than set by configuration.  This should be discussed.  Am making
 25 karl  1.1.2.16       this a separate bug.  See bug 9819 for the changes to cover this.
 26 karl  1.1.2.24    5. Consider moving some more of the code in dispatcher from templates to
 27 karl  1.1.2.23       common functions which would mean adding intermediate classes in
 28                      CIMMessage but would reduce code size. Currently the change that
 29                      we should make for this is to create a new message CIMPullRequestData...
 30                      between CIMRequestDataMessage and the Pull requests since they all
 31                      have exactly the same input and output pararameters (The
 32                      CIMResponseData hides the response object differences)
 33                   6. Extension to avoid double move of objects in CIMResponseData (one
 34 karl  1.1.2.3        into enumerationContext queue and second to new cimResponseData for
 35                      response.  Want to avoid second move by extending Open/Pull response
 36                      messages to include count and CIMResponse data to count objects out
 37 karl  1.1.2.23       of queue when converting (avoids the second move). This would mean
 38                      extending the output writers to allow the count field to be supplied
 39                      so they would only create output for up to the count supplied.
 40 karl  1.1.2.24    7. Add test for the 0 operation timeout in PullErrors.
 41 karl  1.1.2.23    8. Add more static tests (currently only OpenEnumerateInstances is covered).
 42                   9. Could clean up the CIMOperationRequestDecoder.cpp rejectCIMException
 43                      further since there is some overlap.  That is low priority.
 44                   10.Add exception for to many entries in EnumerationContextTable. The
 45                      test exists but is ignored right now.
 46                   7. NEXT TASKS: 
 47                      b. Finish and test the OpenQueryInstances
 48 karl  1.1.2.16       c. Clean up TODOs
 49 karl  1.1.2.23       d. Find issue that is causing occasional failures under load.  It
 50                         is probably a threading issue between the 3 possible threads
 51                	 that use the EnumerationContext (request thread, provider thread,
 52 karl  1.1.2.24 	 timeout thread) and a place where not mutuxed, primarily the
 53                	 timeout thread.
 54 karl  1.1.2.23 
 55 karl  1.1.2.24 22 April 2014
 56                1. Clean up some messages.
 57                2. Still trying to find issue that randomly keeps messages in timeout
 58                   queue long after they have been closed and returned.
 59 karl  1.1.2.23 21 April 2014
 60                1. Reorganizzed code in CIMOperationRequestDecoder.cpp ...Iparam classes.
 61                   Cleaned up the rejectCIMException code.
 62                2. Cleanup some issues in the EnumerationContextTimeout Thread.
 63                3. Fixed issue in pullop where it was using zero as default for default
 64                   operation timeout where it should have been NULL, the DMTF specified
 65                   default.
 66                4. Enabled the test to reject 0 as operation timeout on a request and but
 67                   controled by a #define in CIMOperationRequestDispatcher.cpp
 68                5. Added test for excessive new OperationContext entries in table.
 69                
 70                18 April 2014
 71                1. Internationalize remaining messages in CIMOperationRequestDecoder.cpp and
 72                   clean up the decoders for some of the messages so they use the
 73                   ...Iparam classes.  Note that we did not clean up all of the old message
 74                   decoders, just the new ones and we did not clean up the Count message
 75                   since it is deprecated. TODO clean these up so the decoder is really
 76                   consistent.
 77                2. Enabled the EnumerationContext Timer and removed code for alternate
 78                   non-thread solution.
 79 karl  1.1.2.16 
 80 karl  1.1.2.21 17 April 2014
 81                1. Reorganized the lock/unlock for handling the EnumerationContext because
 82                   there were thread windows (i.e. using the context after it was released
 83                   by other thread).
 84                2. Modified code for the InteroperationTimerThread and deleted old code that
 85                   allowed this whole thread to by bypassed.
 86                3. Internationalized a number of CIMOperationRequestDispatcher CIMException
 87                   response messages.
 88 karl  1.1.2.22 4. Fixed stress tests in Client/tests/pullop that were getting timeout. The
 89                   issue was not the pull code but that fact that the idle client timeout
 90                   appears to be measureing to the end of the operation and the operation
 91                   was taking more than 40 seconds which is the default timeout. The idle
 92                   timeout takes no account of the fact that chunks are being regularly
 93                   delivered.
 94                5. Several minor code changes.
 95                NOTE: At this point the code passes extensive tests of the pull operations
 96                   both in OOP and none OOP mode (but with lots of diagnostics that may
 97                   be affecting timing).
 98 karl  1.1.2.21 
 99 karl  1.1.2.20 10 April 2014
100                1. Fix issues causing failure with repeated pull operations.
101                2. Consolidate some of the CIMOperationRequestDispatcher.cpp template code
102                
103 karl  1.1.2.19 7 April 2104
104                  MergeOut of head of tree.
105                
106                7 April 2014
107                1. Permanently fixed issue with getting correct number of objects on response.
108                   This was introduced when did a temp fix to the OOP processing, in particular
109                   removed the condition variable wait in the CIMOperationDispatcher handle
110                   functions for opens and pulls.  This moved the functionality to kick off
111                   open and pull responses to the provider threads if there are not enough
112                   objects when the handle is processed. Also added a variable to allow us to
113                   test with either a) responses are required to satisfy the original 
114                   request size or) b, responses are required only to return some objects.
115                   We will add statistics to see which of these works best.
116                2. Modified WsmProcessor EnumerationContext class since the name conflicts
117                   with the pull Operation EnumerationContext class.
118                3. Created a new intermediate level of CIMMessage, the CIMPullResponseData
119                   Message so that all of the open and Pull responses can use common code
120                   since there are only two variables (endOfSequence and EnumerationContext)
121                   and they are common across all the open and pull responses.
122                4. Removed a number of diagnostics.
123                5. Cleaned up the Dispcatcher so that the open and pulls have common response
124 karl  1.1.2.19    code and that code can be used from the dispatcher handle functions and
125                   the provider response functions.
126                
127 karl  1.1.2.18 31 March 2014 - Checkin
128                1. Fixed issues in OOP processing of pull operations, in particular
129                   issues with cimxml output format when processed through the
130                   *InternalXmlEncoder functions.
131                2. Clean up some of the internalXml functionality
132                3. Found issues causing timeout with a particular provider.  The issue
133                   is that the dispatcher and monitor end up using the same thread so the
134                   condition variable in the dispatcher thread stops the monitor. Turned
135                   off the conditionVariable in getCache for the moment which means that
136                   we get number of responses for open... with 0 objects before the
137                   providers can begin to respond.  This is only for test.
138                4. Added some statistics for enumerations and display the statistics 
139                   when we close the server (same as cache statistics)
140                
141                12 March 2014 - Mergeout and Mergein
142                1. Mergeout to head of tree for this date and mergein for patch update
143                   to bug 9676
144                2. Extensions to pullop tests program and tests.
145                3. Added some diagnostics in looking for OOP issue.
146                4. Removed a number of diagnostics messages and cleaned up code in
147                   dispatcher to simplify pull operation processing.
148 karl  1.1.2.18 
149 karl  1.1.2.17 15 December 2013
150                1. Mergeout and mergein up to 15 December 2013
151                2. Clean up issues from tests documented in bug 9676 last week.
152                3. Clean up some code in dispatcher
153                4. Remove the filter function from ResponseStressc++Provider.
154                
155 karl  1.1.2.16 21 November 2013
156                1. Mergeout from head of tree to 21 November 2013.
157 karl  1.1.2.15 
158                18 November 2013
159                1. Cleanup of a bunch of minor errors and completion of all of the code for
160                   the openQueryInstances except for the PullInstances in Dispatcher and
161                   the aggregator function.
162                2. OpenqueryInstances added to cimcli.
163 karl  1.1.2.14 
164                13 October 2013 CVS branch update.
165                1. Integrated bug 9786 into the branch.  Note that we need to test the
166                   generated statistics.
167                2. Mergeout executed to update to head of tree as of 8:00 am 13 October 2013.
168                3. Cleaned up several errors in OOP processing.  Note that there is at least
169                   one issue left when we to a pull on ManagedElement in at least one of the
170                   namespaces.
171                4. Cleaned up some of the outstanding diagnostic code
172                5. Generally passes all tests except for one test of pullop where it is trying
173                   to pull enum instances CIM_ManagedElement from a particular namespace.
174 karl  1.1.2.12 
175 karl  1.1.2.16 NOTE: I did not make comments here for changes in October despite the fact
176                that I did 2 mergouts, number of fixes, and a mergein.
177                
178 karl  1.1.2.12 30 September 2013 - CVS Update
179                Mergeout head of tree up to 29 September 2013.
180 karl  1.1.2.10 
181                29 September 2013. CVS update.
182                1. Modified calls to statisticalData.cpp to a) directly call with request
183                   type, b) incorporate the open, pull, etc. messages.  However, since these
184                   are not part of the CIM class, we must do something special with them.
185 karl  1.1.2.13    See bug 9785 for full solution to this issue.
186 karl  1.1.2.10 2. Corrected OOP interface to enable new flag to indicate internal operations
187                   and set host, etc.
188                3. Add code to CQLOperationsDispatcher and WQLOperationDispatcher to clean
189                   up CIMResponseDataCounter after filtering.
190                4. Modified ProviderAgent to set Host info for some pull operations.
191                5. Added new flag to CIMBinMsgSerializer and Deserializer.
192 karl  1.1.2.8  
193 karl  1.1.2.9  17 September 2013 CVS update (Actually two different updates over 3 days)
194                1. Clean up some issues in CIMMessage.h and CIMMessage.cpp
195                2. Extend OpenExecQuery to WQL and CQL processors but return not complete
196                3. Remove memory leak in EnumerationContext and EnumerationContextTable
197                   handling.
198                4. Created template functions for much of the pull operations.
199                5. Reversed order of queryLanguage and query (and changed names to match
200                   execQuery) in client and server.  Note that these are the execQuery
201                   WQL and CQL filters and NOT FQL filters.
202                6. Some code cleanup in dispatcher
203                7. Today, passes all tests in pullop but issue in alltests. For some reason
204                   not finding CIMObjectManager instance. Also, leaves enumeration contexts
205                   if client terminates since cleanup thread not operating.
206 karl  1.1.2.11 8. XML from OOP not correctly processed.
207 karl  1.1.2.9  
208 karl  1.1.2.8  14 September 2013 CVS update
209                Merged out up to 25 August.  Cleaned up all operations and standardized code.
210                At this point the non pull operations code is in a set of templates but the
211                pull is not yet.
212                Fixed a significant number of problems so that it appears that the operations
213                except for OpenExecQuery run stably, at least with the pullop test program.
214                Note that there is a problem in that the Interop control provider is not
215                returning its singleton wbemserver object for some reason.  Causes a test
216                failure
217 karl  1.1.2.7  
218                Fixed for 16 June CVS Update
219                   1. Cleaned up the enumerationContext and Table release functions and tested
220                      to confirm that we do not lose memory in either normal sequences or
221                      sequences that close early. Cleaned up pullop and added more tests
222 karl  1.1.2.8  Taged Before: PREAUG25UPDATE and after POSTAUG25UPDATE
223 karl  1.1.2.4  
224                Fixed for 9 June CVS update
225                   1. Cleaned up code for OpenQueryInstances.  Note that this is incomplete.
226                      No support in WQL or CQL Operations
227                   2. 
228                
229                What was fixed for 5 June checkin.
230 karl  1.1.2.3     1. Extended ResponseTest MOF for for both CMPI and C++ subclasses
231                   2. Fixed issues with pullop.
232                   3. Fixed temp issue with CIMResponseData size by putting in mutex. That
233                      is not a permanent fix but it gets around issue probably in the control
234                      of the move logic that meant counts were off.
235                   4. Fixed issues in Dispatcher so that associator code works. Still messy
236                      code in the dispatcher.
237                   5. Changed name of Enumerationtable.h & cpp to EnumerationContextTable.*
238                   6  Changed name of ResponseStressTest module, classes, etc.
239                
240                TAG: TASK_PEP317_5JUNE_2013_2
241                
242 karl  1.1.2.2  2 June 2013
243 karl  1.1.2.1  
244                Issues  - KS
245                
246 karl  1.1.2.15  - Still way to many TODO and KS comments and KS_TEMPS.  Removing bit by bit.
247 karl  1.1.2.1  
248 karl  1.1.2.15  - Runtime variable connection for the config parameters not installed. That
249                   has been made into a separate bug (see bug 9819)
250 karl  1.1.2.1  
251                5. Issue with the threaded timer.  For some reason during tests it
252                eventually calls the timer thread with trash for the parm (which is
253                pointer to the EnumerationTable object). Caught because we do a valid
254                test at beginning of the function.
255                
256 karl  1.1.2.2  6. Still using the templates in CIMOperationRequestDispatcher to simplify
257                the handle... processing.  
258                
259                7. I think I have a way around the double move of objects in the
260                EnumerationContext so that the outputter will just take a defined number
261                of objects directly from the gathering cache and save the second move.
262                
263 karl  1.1.2.15 8. Not yet passing all tests but getting closer now. The major test that is
264                causing an error today is the execution of a full enumeration with the
265                forceProviders = true.  This causes a client timeout sometimes.
266 karl  1.1.2.2  
267                
268                
269 karl  1.1.2.1  ===========================================
270                
271                OVERVIEW:
272                
273                The operation extensions for pull operations defined in the DMTF specification
274                DSP0200 V 1.4 were implemented in Pegasus effective Pegasus version 2.11
275                including Client and Server.
276                
277                These operations extend the CIM/XML  individual operations to operation
278                sequences where the server must maintain state between operations in a
279                sequence and the client must execute multiple operations to get the full
280                set of instances or instance paths.
281                
282                The following new CIM/XML operations as defined in DSP0200 are included;
283                
284                    -OpenEnumerateInstances
285                    -openEnumerateInstancePaths
286                    -OpenReferenceInstances
287                    -OpenReferenceInstancePaths
288                    -OpenAssociatiorInstances
289                    -OpenAssociatorInstancePaths
290 karl  1.1.2.16     -OpenQueryInstances
291 karl  1.1.2.1      -PullInstancesWithPath
292                    -PullInstancePaths
293 karl  1.1.2.16     -PullInstances
294 karl  1.1.2.1      -CloseEnumeration
295                    -EnumerationCount
296 karl  1.1.2.2       OpenExecQuery
297 karl  1.1.2.1  
298                The following  operations have not been implemented in this version of Pegasus:
299                
300                    -OpenQueryInstances
301                
302                The following limitations on the implementation exist;
303                
304                1. The filterQueryLanguage and filterQuery parameters are processed by
305                   the Pegasus client but the server returns error if there is any data in
306 karl  1.1.2.2     either parameter. This work does not include the development of the
307                   query language.  Note that a separate effort to extend Pegasus to use
308                   the DMTF FQL query language is in process.
309 karl  1.1.2.1  
310                2. The input parameter continueOnError is processed correctly by the client
311                   but the Pegasus server only provides for false since the server does not
312                   include logic to continue processing responses after an error is
313                   encountered. 
314                   This is consistent with the statement in the specification that use of 
315                   this functionality is optional and the fact that the DMTF agrees that all 
316                   of the issues of continuing after errors have not been clarified.  
317                
318                3. The operation enumerationCount is not processed by the server today since
319                   a) really getting the count would be the same cost as the corresponding
320                   enumeration, b) the server does not include a history or estimating
321                   mechanism for this to date.
322 karl  1.1.2.2     NOTE: After a through review as part of the development of the next version
323                   of CMPI we have concluded that this operation is probably not worth the
324                   effort.  Since it is optional, Pegasus will only return the unknown status
325                   at this point
326 karl  1.1.2.1  
327                Since the concept of sequences of operations linked together (open, pull, close)
328                is a major extension to the original CIM/XML operation concept of completely
329                independent operations several new pieces of functionality are implemented
330                to control interOperationTimeouts, counts of objects to be returned, etc.
331                
332                TBD - Review this
333                
334                CLIENT
335                
336                The new operations follow the same pattern as the APIs for existing operations
337                in that:
338                
339                1. All errors are handled as CIMException and Exception
340                
341                2. The means of inputting parameters are the same except that there are
342                   significantly more input parameters with the open operations and for the 
343                   first time operations return parameters as well as objects in the 
344                   response.  Specifically the open and pull operations return values for 
345                   enumerationContext which is the identity for a pull sequence and 
346                   endOfSequence which is the marker the server sends in open and pull 
347 karl  1.1.2.1     responses when it has no more objects to send.
348                
349                The significant differences include:
350                
351                1. Processing of parameters on responses (i.e. the endOfSequence and
352                   enumerationContext parameters are returned for open and pull operations).
353                
354                2. Numeric arguments (Uint32 and Uint64 include the option of NULL in some
355                   cases so they are packaged inside classes Uint32Arg and Uint64Arg in the
356                   client api.
357                
358                3. The association and reference operations ONLY process instances.  They do
359                   not include the capability to return classes like reference and associator
360                   do and therefore return CIMInstance rather than CIMObject.
361                
362                4. Paths are returned in all cases (i.e OpenEnumerateInstances and
363                   PullInstancesWithPath where they were not with EnumeratInstances.
364                
365                5. The client must maintain state between operations in a sequence (using
366                   the enumerationContext parameter).
367                
368 karl  1.1.2.1  TBD- Are there more differences.
369                
370                
371                SERVER
372                
373                The Pegasus server attempts to always deliver the requested number of objects
374                for any open or pull request (the specification allows for the server to
375                deliver less than the requested number of objects and specifically to return
376                zero objects on open).  We felt that it was worth any extra cost in processing
377                to provide the client with exactly what it had requested.
378                
379                The pegasus server always closes an enumeration sequence upon receipt of any
380                error from the providers, repository, etc. Therefore the server will reject
381 karl  1.1.2.2  any request that has continueOnError = true;
382                
383                Expansion to allow the continue on error may be added in a future version.
384                In any case, the whole purpose of the continue on error is really to allow
385                input from good providers to be mixed with providers that return errors so
386                that generally this would mean simply changing the logic in the return mechanism 
387                to not shutdown when an error is received from any given provider.
388                
389                Generally we do not believe that the providers need to do much more in the
390                future to support the continueOnError other than possibly allowing the provider
391                to continue processing after it has received an error.
392 karl  1.1.2.1  
393                PROVIDERS
394                
395                This implementation requires NO changes to the existing providers.  The
396                provider APIs operate just as they do with the original operations.
397                
398                Because the server processing is different however, there may be some
399                behavior differences primarily because the client now controls the speed of
400                delivery of objects.
401                
402                In previous versions of Pegasus, the server attempts to deliver objects as
403                rapidly as then can be put on the network.  In the case of HTTP chunked requests
404                they are delivered in chunks of about 100 objects. The primary delay for the
405                providers was the processing of each segment through the server.  The server
406                is blocked so that no other segment can proceed through the server until that
407                segment is processed and sent on the network.
408                In the case of non-chunkedresponses, they are completely gathered in the serve
409                and then delivered as one non-chunked response. There were no delays for the
410                providers, just lots of possible memory use in the server.
411                
412                The responses from providers (delivered through the deliver(...) interface are
413 karl  1.1.2.1  gathered into segments of about 100 objects and this group of objects is moved
414                through the server to be delivered to the client.
415                
416                However with the inclusion of the pull operations,   The segments of objects
417                from the providers are cached in the server response path until the 
418                maxObjectCount for that request (open or pull) and that number returned in a
419                non-chunked response. Thus, if the client is slow to issue pull requests,
420                the providers might be delayed at some point to reduce memory usage in the
421                server (the delay appears as slow response tothe deliver operation).
422                
423                In other words, the time to process large sets of responses from the provider
424                now depends on the speed of handling the client.
425                
426                It is important to remember in developing providers that the Pegasus server
427                can most efficiently process responses if they are passed from the provider
428                to the server individually or in small arrays of objects rather than the
429                provider gathering very large arrays of objects and sending them to the
430                server.
431                
432 karl  1.1.2.2  NEXT GENERATION PROVIDERS
433                KS_TODO
434                
435 karl  1.1.2.1  CONFIGURATION PARAMETERS
436                
437                The server includes several configuration parameters to set limits on the
438                processing of pull operations.  All of these configuration parameters are
439                compile time parameters rather than runtime.
440                
441                1. Maximum value of minimum interoperation time.  This parameter defines the
442                maximum time allowed between the return of an open or pull response and 
443                the receipt of the next pull or a close operation before the server may 
444                close the enumeration.  The specification allows the server to set a 
445                maximum interoperation time and refuse open requests that with requested 
446                operationTimeout greater than that time.  
447                CIM_ERR_INVALID_OPERATION_TIMEOUT
448                
449                This value is set with the Pegasus environment variable
450                PEGASUS_PULL....
451                
452                2. Maximum objects returned in a single open or pull operation.  The server
453                can set a maximum limit on the number of objects that can be returned in
454                a single open or pull oepration with the maxObjectCount parameter.
455                
456 karl  1.1.2.1  3. Whether the server allows 0 as an interoperation timeout value. The value
457                zero is s special value for the interoperationTimeout in that it tells the
458                server to not timeout any enumeration sequence.
459                
460                With this value for interoperationTimeout, the only way to close an 
461                enumeration sequence is to complete all of the pulls or issue the close.  
462                If for some reason the sequence is not completed, that enumeration context 
463                would remain open indefinitly.  Since in Pegasus any open enumeration 
464                context uses resources (the context object and any provider resposnes that 
465                have not yet been issued in a response) it would appear that most 
466                platforms would not want to allow the existence of enumeration contexts 
467                that cannot be closed by the server.  
468                
469                4, maximum consecutive pull requests with 0 maxObjectCount.  The use of the
470                pull operation with maxObjectCount set to zero could be used to keep an
471                enumeration context open indefinitly (this tells the server to restart the
472                interoperationTimeout but not send any objects in the response). Therefore the
473                specification allows for the server setting maximum limits on this behavior
474                and returning the error CIM_ERR_SERVER_LIMITS_EXCEEDED if this limit is
475                exceeded.
476                Note that this is maximum CONSECUTIVE pulls so that issuing a pull with
477 karl  1.1.2.1  a non-zero count resets this counter.
478                
479                KS-TBD - Is this really logical since we can still block by just issuing
480                lots of zero request and an occansional request for one object.
481                
482                Pegaus sets the value of this limit to 1000 and allows the implementer to
483                modify it with the PEGASUS_MAXIMUM_ZERO_OBJECTCOUNT environment variable.
484                
485                5. Default operationTimeout - 
486                
487                The default of this parameter is to refuse operat
488                
489                In the current release of Pegasus these are all compile time parameters.
490 karl  1.1.2.11 
491                
492                NOTES On working with task branch.
493                
494                Merge out Process
495                
496                   To keep our TASK branch in sync with the current head of tree we need
497                   to do a regular merge out.  the TaskMakefile contains the makefile
498                   procedures to do this efficiently.  NOTE: Following these procedures is
499                   important in that you are merging out new material each time you do
500                   the merge out.  If you were just to repeatedly merge out, you would be
501                   merging previously merged changes a second time causing a real mess.
502                
503                    Start with new directory and put TaskMakefile above pegasus (needed so you
504                    have this file for the initial operations.  
505                
506                      make -f TaskMakefile branch_merge_out BNAME=PEP317-pullop  ## takes a long time
507                
508                   This checks out current head, merges it into task branch and sets tags
509                   for the mergeout.  Note that at the end of this step this work is
510                   part of the TASK... branch.
511 karl  1.1.2.11 
512                   NOW check for conflicts, errors, etc. that resulted from the merge.
513                   Look for conflict flags, compare the results (I use linux merge as a
514                   good graphic compare tool) and build and test. When you are satisfied
515                   that the merge out is clean, you can commit the results to the TASK...
516                   branch
517                   
518                   To commit the work to  this into Task branch
519                
520                      make -f mak/TaskMakefile branch_merge_out_commit BNAME=PEP317-pullop
521                
522                  or manually commit and finish as follows
523                
524                    cvs commit
525                    make -f mak/TaskMakefile  branch_merge_out_finish BNAME=PEP317-pullop
526                
527                ## This last step is important since it cleans up temporary tags to prepare
528                   you for the next checkout
529                   
530                COMPARE TASKBRANCH WITH HEAD
531                
532 karl  1.1.2.11     In a new pegasus work space do same as above for merge out.
533                
534                    make -f TaskMakefile BNAME=PEP317-pullop
535                
536                    This produces a result which is all of the head merged into the branch.
537                    A diff of this is all the new changes to the head of tree that you will
538                    include into the merge.
539                

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2