Return-Path: X-Original-To: apmail-jackrabbit-oak-dev-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3EF549DD4 for ; Tue, 3 Apr 2012 12:12:45 +0000 (UTC) Received: (qmail 43674 invoked by uid 500); 3 Apr 2012 12:12:45 -0000 Delivered-To: apmail-jackrabbit-oak-dev-archive@jackrabbit.apache.org Received: (qmail 43610 invoked by uid 500); 3 Apr 2012 12:12:45 -0000 Mailing-List: contact oak-dev-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-dev@jackrabbit.apache.org Received: (qmail 43582 invoked by uid 99); 3 Apr 2012 12:12:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Apr 2012 12:12:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.116] (HELO hel.zones.apache.org) (140.211.11.116) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Apr 2012 12:12:44 +0000 Received: from hel.zones.apache.org (hel.zones.apache.org [140.211.11.116]) by hel.zones.apache.org (Postfix) with ESMTP id F3421356773 for ; Tue, 3 Apr 2012 12:12:23 +0000 (UTC) Date: Tue, 3 Apr 2012 12:12:23 +0000 (UTC) From: "Thomas Mueller (Commented) (JIRA)" To: oak-dev@jackrabbit.apache.org Message-ID: <1697141655.5871.1333455144009.JavaMail.tomcat@hel.zones.apache.org> In-Reply-To: <2095566482.5548.1333449743300.JavaMail.tomcat@hel.zones.apache.org> Subject: [jira] [Commented] (OAK-45) Add support for branching and merging of private copies to MicroKernel MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 X-Virus-Checked: Checked by ClamAV on apache.org [ https://issues.apache.org/jira/browse/OAK-45?page=3Dcom.atlassian.jir= a.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=3D13245248= #comment-13245248 ]=20 Thomas Mueller commented on OAK-45: ----------------------------------- As also discussed on the list, I'm not sure if that would be a good idea, g= iven it might turn out to be impossible to support efficiently, correctly, = and easily on some MicroKernel implementations. =20 > Add support for branching and merging of private copies to MicroKernel > ---------------------------------------------------------------------- > > Key: OAK-45 > URL: https://issues.apache.org/jira/browse/OAK-45 > Project: Jackrabbit Oak > Issue Type: New Feature > Components: mk > Reporter: Michael D=C3=BCrig > > 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: > {code} > String addLotsOfData(MicroKernel mk) {=20 > String baseRevision =3D mk.getHeadRevision();=20 > String branchRevision =3D mk.branch(baseRevision);=20 > for (int i =3D 0; i < 1000000; i++) {=20 > branchRevision =3D mk.commit("/", "+\"node" + i + "\":{}",=20 > branchRevision, null);=20 > }=20 > return mk.merge(branchRevision, baseRevision); }=20 > {code} > [1] http://markmail.org/message/jbbut6vzvmmjqonr -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrato= rs: https://issues.apache.org/jira/secure/ContactAdministrators!default.jsp= a For more information on JIRA, see: http://www.atlassian.com/software/jira