[OAK-45] Add support for branching and merging of private copies to MicroKernel

• Type: New Feature
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Fix Version/s: 0.3
• Component/s: mk
• Assignee: Stefan Guggisberg
• Reporter: Michael Dürig
• Created: 03/Apr/12 10:42
• Updated: 05/Jul/12 15:02
• Resolved: 23/May/12 15:23

Description

As discussed on the dev list [1] we should add support to the Microkernel for branching of a private working copy which can be merged back later:

String addLotsOfData(MicroKernel mk) { 
    String baseRevision = mk.getHeadRevision(); 
    String branchRevision = mk.branch(baseRevision); 
    for (int i = 0; i < 1000000; i++) { 
        branchRevision = mk.commit("/", "+\"node" + i + "\":{}", 
            branchRevision, null); 
    } 
    return mk.merge(branchRevision, baseRevision); } 

[1] http://markmail.org/message/jbbut6vzvmmjqonr