You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@directory.apache.org by Stefan Seelmann <ma...@stefan-seelmann.de> on 2017/11/30 21:32:14 UTC
Re: Merge "value" branches to trunk/master and move to git
On 10/01/2017 09:19 PM, Stefan Seelmann wrote:
> Hi,
>
> For API, server, and studio we have the "value" branches. Should we
> merge them back to trunk/master?
>
> Second question is if we should move to git/gitbox with all the
> remaining projects (server, studio, mavibot, project)
Now that git migration is done back to the first question :)
Can we merge the "value" branches to master?
The branch exists in
* Mavibot
* LDAP API
* Server
* Studio
The Mavibot branch doesn't compile. However I think we don't need to
merge it right now because the Server branch still uses 1.0.0.M8 so
doesn't depend on the branch.
The other 3 branches compile but there are some test failures (~40 in
API, ~80 in Server, 3 in Studio excluing UI tests). Otherwise it looks
good, I can start Studio and run an ApacheDS can connect to it :)
I'd suggest we first try to fix the tests in the branch first. I'll try
to help, probably not much in the next days but next week then.
Kind Regards,
Stefan
Re: Merge "value" branches to trunk/master and move to git
Posted by Emmanuel Lécharny <el...@gmail.com>.
Le 30/11/2017 à 22:32, Stefan Seelmann a écrit :
> On 10/01/2017 09:19 PM, Stefan Seelmann wrote:
>> Hi,
>>
>> For API, server, and studio we have the "value" branches. Should we
>> merge them back to trunk/master?
>>
>> Second question is if we should move to git/gitbox with all the
>> remaining projects (server, studio, mavibot, project)
> Now that git migration is done back to the first question :)
>
> Can we merge the "value" branches to master?
I think that is the plan.
>
> The branch exists in
> * Mavibot
> * LDAP API
> * Server
> * Studio
>
> The Mavibot branch doesn't compile. However I think we don't need to
> merge it right now because the Server branch still uses 1.0.0.M8 so
> doesn't depend on the branch.
Right. I still have some fixes to apply in Mavibot to make it compile,
at least in trunk.
>
> The other 3 branches compile but there are some test failures (~40 in
> API, ~80 in Server, 3 in Studio excluing UI tests). Otherwise it looks
> good, I can start Studio and run an ApacheDS can connect to it :)
I have 2 errors in API, due to some late changes I have done - and I
just have fixed some of the other failures in ldap-model -. I haven't
yet checked apacheds, but I belive the failures are all due to teh
change I made in teh API, related to the isHR flag in Value (this is
related to an issue reported in Studio 3 weeks ago). This should not be
too complex to fix.
>
> I'd suggest we first try to fix the tests in the branch first. I'll try
> to help, probably not much in the next days but next week then.
I'll take the necessary time to get this fixed. This was building 1
month ago, I broke it. We both have little time to dedicate to that,
don't waste your time fixing my mistakes :-)
Once we get both API and ApacheDS building, yes, we can merge them in
trunk. Note that the API has changed, so it should probably be a 2.0 at
this point.
Thanks !
--
Emmanuel Lecharny
Symas.com
directory.apache.org
Re: Merge "value" branches to trunk/master and move to git
Posted by Emmanuel Lécharny <el...@gmail.com>.
Le 22/12/2017 à 10:07, Stefan Seelmann a écrit :
> On 12/21/2017 10:06 PM, Emmanuel Lécharny wrote:
>> lokking at the latest commits, I see :
>>
>>
>> [directory-ldap-api] 01/01: Merge branch 'master' into shared-value
>>
>> and
>>
>> from 19af188 Merge branch 'master' into apacheds-value
>>
>>
>> Should I understand you merged the trunk with the value branch for both
>> the API and ApacheDS ? or is the Master also contain the value branch
>> updates ?
>
> I did the following:
>
> 1. git checkout shared-value
> 2. git merge -s ours master
> 3. git checkout master
> 4. git merge shared-value
>
> In (2) I merged the master (trunk) into the value branch using the
> "ours" merge strategy which means the value branch head wins, see [1]
> for details. Then in (4) the result was merged back to master,
> unfortunately I did a fast-forward merge so no explicit commit
> value->master is visible.
>
> But yes, the master branches contain all changes of the value branches.
Ok, thanks. That means we can now consider the value branch a dead branch.
Happy christmas !!
--
Emmanuel Lecharny
Symas.com
directory.apache.org
Re: Merge "value" branches to trunk/master and move to git
Posted by Stefan Seelmann <ma...@stefan-seelmann.de>.
On 12/21/2017 10:06 PM, Emmanuel Lécharny wrote:
> lokking at the latest commits, I see :
>
>
> [directory-ldap-api] 01/01: Merge branch 'master' into shared-value
>
> and
>
> from 19af188 Merge branch 'master' into apacheds-value
>
>
> Should I understand you merged the trunk with the value branch for both
> the API and ApacheDS ? or is the Master also contain the value branch
> updates ?
I did the following:
1. git checkout shared-value
2. git merge -s ours master
3. git checkout master
4. git merge shared-value
In (2) I merged the master (trunk) into the value branch using the
"ours" merge strategy which means the value branch head wins, see [1]
for details. Then in (4) the result was merged back to master,
unfortunately I did a fast-forward merge so no explicit commit
value->master is visible.
But yes, the master branches contain all changes of the value branches.
Kind Regards,
Stefan
[1] https://git-scm.com/docs/git-merge#git-merge-ours
Re: Merge "value" branches to trunk/master and move to git
Posted by Emmanuel Lécharny <el...@gmail.com>.
Le 13/12/2017 à 00:59, Stefan Seelmann a écrit :
> On 12/12/2017 11:44 PM, Emmanuel Lécharny wrote:
>> Le 12/12/2017 à 20:33, Stefan Seelmann a écrit :
>>>>> ApacheDS builds too. Now I have some OSGi related issues in Studio build
>>>>> that I try to fix...
>>>>
>>>> Great !!
>>>>
>>>> I hope it's not going to painful to fix... Last time I worked on it, it
>>>> took me a full day :/
>>>
>>> Studio build is also successful. I'm going to merge the value branches
>>> to master for ldap-api, server, and studio.
>>
>> +1 !
>>
>> That will solve numerous issues in the server (and in studio)
>
> Done.
>
> ldap-api and server build fine on Jenkins. Studio still has some test
> errors on Jenkins (but worked on my machine), I'll investigate in the
> next days.
Hi Stefan
lokking at the latest commits, I see :
[directory-ldap-api] 01/01: Merge branch 'master' into shared-value
and
from 19af188 Merge branch 'master' into apacheds-value
Should I understand you merged the trunk with the value branch for both
the API and ApacheDS ? or is the Master also contain the value branch
updates ?
Thanks !
--
Emmanuel Lecharny
Symas.com
directory.apache.org
Re: Merge "value" branches to trunk/master and move to git
Posted by Stefan Seelmann <ma...@stefan-seelmann.de>.
On 12/12/2017 11:44 PM, Emmanuel Lécharny wrote:
> Le 12/12/2017 à 20:33, Stefan Seelmann a écrit :
>>>> ApacheDS builds too. Now I have some OSGi related issues in Studio build
>>>> that I try to fix...
>>>
>>> Great !!
>>>
>>> I hope it's not going to painful to fix... Last time I worked on it, it
>>> took me a full day :/
>>
>> Studio build is also successful. I'm going to merge the value branches
>> to master for ldap-api, server, and studio.
>
> +1 !
>
> That will solve numerous issues in the server (and in studio)
Done.
ldap-api and server build fine on Jenkins. Studio still has some test
errors on Jenkins (but worked on my machine), I'll investigate in the
next days.
Kind Regards,
Stefan
Re: Merge "value" branches to trunk/master and move to git
Posted by Emmanuel Lécharny <el...@gmail.com>.
Le 12/12/2017 à 20:33, Stefan Seelmann a écrit :
>>> ApacheDS builds too. Now I have some OSGi related issues in Studio build
>>> that I try to fix...
>>
>> Great !!
>>
>> I hope it's not going to painful to fix... Last time I worked on it, it
>> took me a full day :/
>
> Studio build is also successful. I'm going to merge the value branches
> to master for ldap-api, server, and studio.
+1 !
That will solve numerous issues in the server (and in studio)
--
Emmanuel Lecharny
Symas.com
directory.apache.org
Re: Merge "value" branches to trunk/master and move to git
Posted by Stefan Seelmann <ma...@stefan-seelmann.de>.
>> ApacheDS builds too. Now I have some OSGi related issues in Studio build
>> that I try to fix...
>
> Great !!
>
> I hope it's not going to painful to fix... Last time I worked on it, it
> took me a full day :/
Studio build is also successful. I'm going to merge the value branches
to master for ldap-api, server, and studio.
Kind Regards,
Stefan
Re: Merge "value" branches to trunk/master and move to git
Posted by Emmanuel Lécharny <el...@gmail.com>.
Le 06/12/2017 à 22:40, Stefan Seelmann a écrit :
> On 12/01/2017 01:40 AM, Emmanuel Lécharny wrote:
>>
>>
>> Le 30/11/2017 à 22:32, Stefan Seelmann a écrit :
>>> On 10/01/2017 09:19 PM, Stefan Seelmann wrote:
>>>> Hi,
>>>>
>>>> For API, server, and studio we have the "value" branches. Should we
>>>> merge them back to trunk/master?
>>>>
>>>> Second question is if we should move to git/gitbox with all the
>>>> remaining projects (server, studio, mavibot, project)
>>>
>>> Now that git migration is done back to the first question :)
>>>
>>> Can we merge the "value" branches to master?
>>>
>>> The branch exists in
>>> * Mavibot
>>> * LDAP API
>>> * Server
>>> * Studio
>>>
>>> The Mavibot branch doesn't compile. However I think we don't need to
>>> merge it right now because the Server branch still uses 1.0.0.M8 so
>>> doesn't depend on the branch.
>>>
>>> The other 3 branches compile but there are some test failures (~40 in
>>> API, ~80 in Server, 3 in Studio excluing UI tests). Otherwise it looks
>>> good, I can start Studio and run an ApacheDS can connect to it :)
>>>
>>> I'd suggest we first try to fix the tests in the branch first. I'll try
>>> to help, probably not much in the next days but next week then.
>>>
>>> Kind Regards,
>>> Stefan
>>>
>>
>> FTR, with my last fixes, teh LDAP API value branch now builds
>
> ApacheDS builds too. Now I have some OSGi related issues in Studio build
> that I try to fix...
Great !!
I hope it's not going to painful to fix... Last time I worked on it, it
took me a full day :/
--
Emmanuel Lecharny
Symas.com
directory.apache.org
Re: Merge "value" branches to trunk/master and move to git
Posted by Stefan Seelmann <ma...@stefan-seelmann.de>.
On 12/01/2017 01:40 AM, Emmanuel Lécharny wrote:
>
>
> Le 30/11/2017 à 22:32, Stefan Seelmann a écrit :
>> On 10/01/2017 09:19 PM, Stefan Seelmann wrote:
>>> Hi,
>>>
>>> For API, server, and studio we have the "value" branches. Should we
>>> merge them back to trunk/master?
>>>
>>> Second question is if we should move to git/gitbox with all the
>>> remaining projects (server, studio, mavibot, project)
>>
>> Now that git migration is done back to the first question :)
>>
>> Can we merge the "value" branches to master?
>>
>> The branch exists in
>> * Mavibot
>> * LDAP API
>> * Server
>> * Studio
>>
>> The Mavibot branch doesn't compile. However I think we don't need to
>> merge it right now because the Server branch still uses 1.0.0.M8 so
>> doesn't depend on the branch.
>>
>> The other 3 branches compile but there are some test failures (~40 in
>> API, ~80 in Server, 3 in Studio excluing UI tests). Otherwise it looks
>> good, I can start Studio and run an ApacheDS can connect to it :)
>>
>> I'd suggest we first try to fix the tests in the branch first. I'll try
>> to help, probably not much in the next days but next week then.
>>
>> Kind Regards,
>> Stefan
>>
>
> FTR, with my last fixes, teh LDAP API value branch now builds
ApacheDS builds too. Now I have some OSGi related issues in Studio build
that I try to fix...
Re: Merge "value" branches to trunk/master and move to git
Posted by Emmanuel Lécharny <el...@gmail.com>.
Le 30/11/2017 à 22:32, Stefan Seelmann a écrit :
> On 10/01/2017 09:19 PM, Stefan Seelmann wrote:
>> Hi,
>>
>> For API, server, and studio we have the "value" branches. Should we
>> merge them back to trunk/master?
>>
>> Second question is if we should move to git/gitbox with all the
>> remaining projects (server, studio, mavibot, project)
>
> Now that git migration is done back to the first question :)
>
> Can we merge the "value" branches to master?
>
> The branch exists in
> * Mavibot
> * LDAP API
> * Server
> * Studio
>
> The Mavibot branch doesn't compile. However I think we don't need to
> merge it right now because the Server branch still uses 1.0.0.M8 so
> doesn't depend on the branch.
>
> The other 3 branches compile but there are some test failures (~40 in
> API, ~80 in Server, 3 in Studio excluing UI tests). Otherwise it looks
> good, I can start Studio and run an ApacheDS can connect to it :)
>
> I'd suggest we first try to fix the tests in the branch first. I'll try
> to help, probably not much in the next days but next week then.
>
> Kind Regards,
> Stefan
>
FTR, with my last fixes, teh LDAP API value branch now builds
--
Emmanuel Lecharny
Symas.com
directory.apache.org