Changes between Version 1 and Version 2 of SoC2007Darcs


Ignore:
Timestamp:
Jul 6, 2007 6:02:08 PM (7 years ago)
Author:
JasonDagit
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • SoC2007Darcs

    v1 v2  
    11= Complete =  
    22 * Create '''conflicted''' patch type to store conflicted patches, and associated commutation rules 
    3 * Create a new merge algorithm that handles conflicts by generating conflicted patches 
     3 * Create a new merge algorithm that handles conflicts by generating conflicted patches 
    44 
     5= In Progress = 
     6 * Prove the merge algorithm gives the same answer regardless of merge order 
     7 * Create Named primitive patches 
    58 
    69= Todo = 
    7 * Prove the merge algorithm gives the same answer regardless of merge order 
    8 * Create Named primitive patches 
    9 * Create cancellation patches for marking conflicted (and other types of patches) as canceled. 
    10 * Storage implementation for unresolved conflicts (store a set of conflicted parallel patches) 
    11 * unmerge, needed when something is canceled 
    12 * UI for working with conflicts 
     10 * Create cancellation patches for marking conflicted (and other types of patches) as canceled. 
     11 * Storage implementation for unresolved conflicts (store a set of conflicted parallel patches) 
     12 * '''unmerge''', needed when something is canceled 
     13 * UI for working with conflicts