jackrabbit-oak-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Marcel Reutegger <mreut...@adobe.com>
Subject RE: MicroKernelIT#conflictingMove
Date Tue, 15 Jan 2013 12:19:06 GMT
> In a nutshell here is what I think we should do: MK.commit should fail
> on all but conflicts which are trivially merged. This will not be a
> problem for oak-core since oak-core applies changes to private branches
> and will merge these on Session.save. Before merging, branches are
> rebased and that's the place where the more complicated conflict
> handling should go. Due to rebasing the subsequent merge will not
> conflict any more.

this involves retrying the commit, which is not the case currently, right?

does that mean in the near future a MK should always fail early as soon
as it detects it need to merge something?

> See my POC work on https://issues.apache.org/jira/browse/OAK-536 for
> how
> such a rebase operation could look like. Note that the current
> implementation is not complete yet since it just throws an exception on
> conflicts. I will soon update this to a more complete implementation
> which correctly annotates conflicts such that oak-core can further
> handle these.

are you referring to an implementation in oak-mongomk?


View raw message