jackrabbit-oak-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Guggisberg <stefan.guggisb...@gmail.com>
Subject Re: branch/merge bug in MicroKernelImpl?
Date Thu, 25 Oct 2012 13:55:23 GMT
On Thu, Oct 25, 2012 at 3:38 PM, Mete Atamel <matamel@adobe.com> wrote:
> Hi,
>
> I think I found a bug with branch/merge in MicroKernelImpl but wanted to
> make sure. The last assert in the test fails. Could someone verify that
> this is indeed a bug?

thanks, i'll have a look.

cheers
stefan

>
> @Test
>     public void test() {
>         mk.commit("", "+\"/trunk\":{}", null, "");
>         mk.commit("", "+\"/trunk/child1\":{}", null, "");
>
>         String branchRev = mk.branch(null);
>         branchRev = mk.commit("", "+\"/trunk/child1/child2\":{}",
> branchRev, "");
>
>         mk.commit("", "+\"/trunk/child3\":{}", null, "");
>
>         mk.merge(branchRev, "");
>
>         assertTrue(mk.nodeExists("/trunk", null));
>         assertTrue(mk.nodeExists("/trunk/child1", null));
>         assertTrue(mk.nodeExists("/trunk/child1/child2", null));
>         assertTrue(mk.nodeExists("/trunk/child3", null));
>     }
>
>
> -Mete
>

Mime
View raw message