You are viewing a plain text version of this content. The canonical link for it is here.

Posted to oak-issues@jackrabbit.apache.org by "Michael Dürig (JIRA)" <ji...@apache.org> on 2013/12/18 11:30:07 UTC

[jira] [Resolved] (OAK-1294) Avoid purging transient changes when rebasing branches

     [ https://issues.apache.org/jira/browse/OAK-1294?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Michael Dürig resolved OAK-1294.
--------------------------------

       Resolution: Fixed
    Fix Version/s: 0.14

Fixed at http://svn.apache.org/r1551900

Rebase the branch and then rebase the in memory changes on top of the rebased branch. As discussed in the discussion linked in the issue description. 



> Avoid purging transient changes when rebasing branches
> ------------------------------------------------------
>
>                 Key: OAK-1294
>                 URL: https://issues.apache.org/jira/browse/OAK-1294
>             Project: Jackrabbit Oak
>          Issue Type: Improvement
>          Components: core
>    Affects Versions: 0.13
>            Reporter: Chetan Mehrotra
>            Assignee: Michael Dürig
>             Fix For: 0.14
>
>
> Currently a rebase operation involves a purge which leads to frequent branch commits. If possible such commits should be avoided and rebase be performed in memory
> For more details refer to [1]
> [1] http://jackrabbit-oak.markmail.org/thread/6fdckgvhns4acvdw 



--
This message was sent by Atlassian JIRA
(v6.1.4#6159)