Help needed with current implementation for Tombstone reanimation feature

Kamen Mazdrashki kamenim at samba.org
Fri Nov 28 19:08:09 MST 2014


Hi Jelmer,

On Fri, Nov 28, 2014 at 4:51 PM, Jelmer Vernooij <jelmer at samba.org> wrote:

> Hi Kamen,
>
> On Fri, Nov 28, 2014 at 06:37:26AM +0100, Kamen Mazdrashki wrote:
> > Recently we (me and Nadya with mighty help of Andrew) have been working
> on
> > Tombstone reanimation feature implementation in Samba.
> > Here is the branch:
> > https://github.com/kamenim/samba/commits/tombstone-reanimation-wip
> > And a pull request for tight view:
> > https://github.com/kamenim/samba/pull/2
> >
> > By the same time, you have pushed for review quite a number of
> > unittest-related patches.
> > So we decided to base our work on top of your patches expecting those
> > patches
> > are going to be merged soon.
> > And here comes my problem lately - I can't rebase the branch on top of
> > current master anymore due to lots of merge conflicts in unittest-related
> > patches.
> > It looks like this code have been partially merged already.
> Yes, my code has been partially merged. This is especially the code that
> would be
> relevant to you. The code that has not been merged, the upgrade to
> subunit2, should
> not be relevant to you.
>
> Have you tried rebasing all your changes on master, while skipping my
> patches in your
> branch?
>
> yes and it rebases just fine :)
Testing it right now and it seems working fine (wiht the exception that I
can't add my test to test.py for some reason)

Cheers,
Kamen


More information about the samba-technical mailing list