Parallel development and merging

From: Tim Ellison/OTT/OTI (Tim_Ellison@oti.com)
Date: Wed, Jun 21 2000

  • Next message: Tim Ellison/OTT/OTI: "Versioned colection private members"

    To: ietf-dav-versioning@w3.org
    Message-ID: <OFE4CEF8A5.B26B53BE-ON85256905.004972D6@ott.oti.com>
    From: "Tim Ellison/OTT/OTI" <Tim_Ellison@oti.com>
    Date: Wed, 21 Jun 2000 09:32:46 -0400
    Subject: Parallel development and merging
    
    protocol 4.8 section 9.2
    
    (a) This section should include a description of the effect of merging if 
    the destination workspace target is a working resource or unversioned 
    resource (presumably, it fails).
    
    (b) The last paragraph reads:
    "If the server is capable of automatically performing the MERGE, it MAY 
    update the content of the working resource and the DAV:predecessor set 
    itself.  An automatic merge is indicated by the absence of a 
    DAV:merge-set.  Before checking in the working resource, the author is 
    responsible for verifying that the automatic merge is correct."
    
    How would you know which working resources to check if they are indicated 
    by the absence of a property?
    There may be other working resources that were not created by the merge 
    that also do not have that property.
    
    Tim