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:15:37 GMT
Hi,

> Right, when CommitCommandNew detects a concurrent commit, it retries
> the
> whole commit loop with mergeNodes etc. but I think the real problem
> regarding conflictingMove test is that CommitCommandNew#mergeNodes
> does
> not detect merge conflicts between base revision nodes and head nodes at
> the moment. I'm not sure if there's an easy way to detect those merge
> conflicts but committing against head revision (instead of base revision)
> seems to get rid of this problem. So I guess I need to understand why it
> is important to commit against base revision in CommitCommandNew.

one of the issues we were able to solve with this change was OAK-507.
I think it's also the most straight forward way to handle these kind of
commits. apply the change to the specified revision. then rebase to head
and commit.

regards
 marcel

Mime
View raw message