Re: Txn branch merge : headsup

[Selcuk AYA <ay...@gmail.com>]

HI Emmanuel,

can you let me know how the merge is going? If you are having
problems, please point me where I can look at them or if you have any
concerns, we can have a chat on IRC your Wednesday morning?

thanks
Selcuk

On Tue, May 22, 2012 at 8:14 AM, Emmanuel Lécharny <el...@gmail.com> wrote:
> Hi,
>
> so as of today, I have merged 37 out of 54 modules. The following modules
> still have to be merged :
>
> apacheds-core-api
> apacheds-core-shared
> apacheds-core
> apacheds-core-avl
> apacheds-xdbm-partition
> apacheds-ldif-partition
> apacheds-jdbm-partition
> apacheds-core-annotations
> apacheds-server-config
> apacheds-server-jndi
> apacheds-server-replication
> apacheds-xdbm-tools
> apacheds-core-integ
> apacheds-server-integ
> apacheds-kerberos-test
> ldap-client-test
> apacheds-service
>
> Some of them require few modifications, some other are more complex. I'll
> keep you informed as soon as I make progress.
>
> --
> Regards,
> Cordialement,
> Emmanuel Lécharny
> www.iktek.com
>

Re: Txn branch merge : headsup

[Emmanuel Lécharny <el...@gmail.com>]

So far, the remaining modules that I still have to resolve conflits in are :
* apacheds-core-shared (processing it atm)
! apacheds-core-avl
! apacheds-xdbm-partition
! apacheds-ldif-partition
! apacheds-jdbm-partition
! apacheds-core-annotations
! apacheds-server-config
! apacheds-server-jndi
! apacheds-server-replication
! apacheds-xdbm-tools
! apacheds-core-integ
! apacheds-server-integ
! ldap-client-test
! apacheds-service

I'm almost done with apacheds-core-shared, which is the key module, as 
all the other modules depend on it. I still have around 10 errors in the 
DefaultOperationExecutionManager class, and that's it. It's all about 
removing the OneLevel and SubLevel index.

Otherwise, tests are passing up to ApacheDS Core API, which is not far. 
I do expect that I can fix core-shared in the next couple of hours, then 
the next big step will be to get core-avl happy :)

Still looking for the best method to commit what I currently have 
without destroying tunk not losing anyhting.


-- 
Regards,
Cordialement,
Emmanuel Lécharny
www.iktek.com

Re: Txn branch merge : headsup

[Emmanuel Lécharny <el...@gmail.com>]

Le 6/11/12 7:52 AM, Selcuk AYA a écrit :
> Hi Emmanuel.
> I think the best way is to first merge the trunk to the branch
I tried both options, and both are equivalent.

> and
> then verify the merge and then merge back to trunk. Please let me know
> if it is possible for you to dump your ongoing effort to a branch.
Sadly no, not until I have some conflicts. SVN does not allow you to 
commit until you've fixed all the conflicts.
>   If
> not, I will try to merge the trunk to the branch I have.
Yes, do that, so that the first of us wh have something working will be 
the next trunk.


-- 
Regards,
Cordialement,
Emmanuel Lécharny
www.iktek.com

Re: Txn branch merge : headsup

[Selcuk AYA <ay...@gmail.com>]

Hi Emmanuel.
I think the best way is to first merge the trunk to the branch and
then verify the merge and then merge back to trunk. Please let me know
if it is possible for you to dump your ongoing effort to a branch. If
not, I will try to merge the trunk to the branch I have.

thanks
Selcuk

On Sat, Jun 9, 2012 at 5:24 AM, Alex Karasulu <ak...@apache.org> wrote:
>
>
> On Fri, Jun 8, 2012 at 8:58 PM, Emmanuel Lécharny <el...@gmail.com>
> wrote:
>>
>> Le 6/8/12 6:50 PM, Selcuk AYA a écrit :
>>
>>> Hi Emmanuel,
>>> if you can give me information on how I can access your ongoing work,
>>> I can help you with AVL changes and change to move xdbm to core and
>>> core-api. Just let me know how and when I can start playing around
>>> with it.
>>
>>
>> I wish I can :/
>>
>> All the changes I have made so far are on my workspace, which is a
>> checkout of apacheds/trunk... If I commit that, trunk will be doomed. I need
>> a couple of hours to find the best way to get all my files moved to a
>> branch, but still having all the conflits.
>
>
> You can shelf your work in SVN like so:
>
> http://markphip.blogspot.com/2007/01/shelves-in-subversion.html
>
>
> --
> Best Regards,
> -- Alex
>

Re: Txn branch merge : headsup

[Alex Karasulu <ak...@apache.org>]

On Fri, Jun 8, 2012 at 8:58 PM, Emmanuel Lécharny <el...@gmail.com>wrote:

> Le 6/8/12 6:50 PM, Selcuk AYA a écrit :
>
>  Hi Emmanuel,
>> if you can give me information on how I can access your ongoing work,
>> I can help you with AVL changes and change to move xdbm to core and
>> core-api. Just let me know how and when I can start playing around
>> with it.
>>
>
> I wish I can :/
>
> All the changes I have made so far are on my workspace, which is a
> checkout of apacheds/trunk... If I commit that, trunk will be doomed. I
> need a couple of hours to find the best way to get all my files moved to a
> branch, but still having all the conflits.
>

You can shelf your work in SVN like so:

http://markphip.blogspot.com/2007/01/shelves-in-subversion.html


-- 
Best Regards,
-- Alex

Re: Txn branch merge : headsup

[Emmanuel Lécharny <el...@gmail.com>]

Le 6/8/12 6:50 PM, Selcuk AYA a écrit :
> Hi Emmanuel,
> if you can give me information on how I can access your ongoing work,
> I can help you with AVL changes and change to move xdbm to core and
> core-api. Just let me know how and when I can start playing around
> with it.

I wish I can :/

All the changes I have made so far are on my workspace, which is a 
checkout of apacheds/trunk... If I commit that, trunk will be doomed. I 
need a couple of hours to find the best way to get all my files moved to 
a branch, but still having all the conflits.


-- 
Regards,
Cordialement,
Emmanuel Lécharny
www.iktek.com

Re: Txn branch merge : headsup

[Selcuk AYA <ay...@gmail.com>]

Hi Emmanuel,
if you can give me information on how I can access your ongoing work,
I can help you with AVL changes and change to move xdbm to core and
core-api. Just let me know how and when I can start playing around
with it.

thanks,
Selcuk

On Fri, Jun 8, 2012 at 8:37 AM, Emmanuel Lécharny <el...@gmail.com> wrote:
> A bit of heads up here...
>
> So I continued with the branch -> trunk merge, because it's easier and
> whatever I'll do, doing the opposite will cost the same.
>
> I do have a couple of serious issues due to some classes having been
> moved,mainly those that have been moved from xdbm to core-api. I'm dealing
> with that.
>
> Otherwise, in 8 months, we have seen massive changes in both sde, even if I
> tried to merge back trunk into the branch periodically. The impacted areas
> are :
> - use of UUID in the backend
> - removal of the OneLevel and SubLevel index
> - many changes in the Avl tree (replaced by a ConcurrentNavigableMap,
> AFAICT)
>
> I'll be working on that this week-end, it's hard and painful, but it will
> work at the end. ANyway, we have little options at this point...
>
>
> --
> Regards,
> Cordialement,
> Emmanuel Lécharny
> www.iktek.com
>

Re: Txn branch merge : headsup

[Emmanuel Lécharny <el...@gmail.com>]

A bit of heads up here...

So I continued with the branch -> trunk merge, because it's easier and 
whatever I'll do, doing the opposite will cost the same.

I do have a couple of serious issues due to some classes having been 
moved,mainly those that have been moved from xdbm to core-api. I'm 
dealing with that.

Otherwise, in 8 months, we have seen massive changes in both sde, even 
if I tried to merge back trunk into the branch periodically. The 
impacted areas are :
- use of UUID in the backend
- removal of the OneLevel and SubLevel index
- many changes in the Avl tree (replaced by a ConcurrentNavigableMap, 
AFAICT)

I'll be working on that this week-end, it's hard and painful, but it 
will work at the end. ANyway, we have little options at this point...

-- 
Regards,
Cordialement,
Emmanuel Lécharny
www.iktek.com

Re: Txn branch merge : headsup

[Emmanuel Lécharny <el...@gmail.com>]

Le 6/4/12 9:58 PM, Selcuk AYA a écrit :
> HI Emmanuel,
>
> can you let me know how the merge is going? If you are having
> problems, please point me where I can look at them or if you have any
> concerns, we can have a chat on IRC your Wednesday morning?
Hi Selcuk,

as a matter of fact, I was currently making progress. Last week was very 
busy for me, but doing many other things. I started again this morning, 
and I'm almost done with the DefaultOperationManager merge (this is the 
most impacted class so far). I'll then probably be able to finish the 
apacheds-core module.

I'll keep you updated tomorrow about my progresses.



-- 
Regards,
Cordialement,
Emmanuel Lécharny
www.iktek.com