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

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2