db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Armin Waibel <arm...@apache.org>
Subject Re: OJB 1.0.1 Bug Fix Release ?
Date Tue, 27 Jul 2004 00:57:12 GMT
Jakob Braeuchi wrote:

> hi armin,
> 
> my fixes are in (except the support for mixed-mapping, imo this is 
> scheduled for 1.1 ?)
>

my fixes are in too + the new IdentityFactory support and updated docs.

regards,
Armin

> jakob
> 
> Armin Waibel schrieb:
> 
>> Hi Jakob,
>>
>> yep. I will start to merge my fixes this evening.
>>
>> regards
>> Armin
>>
>> Jakob Braeuchi wrote:
>>
>>> hi armin,
>>>
>>> i have my fixes ready. should i commit now ?
>>>
>>> jakob
>>>
>>> Armin Waibel schrieb:
>>>
>>>> ok, thanks again. Will start with merge at Monday or Thursday.
>>>> Schedule the 1.0.1 release to August 1th/2th?
>>>>
>>>> regards,
>>>> Armin
>>>>
>>>> Brian McCallister wrote:
>>>>
>>>>> Trunk to branch should probably be done by hand. CVS automerge will 
>>>>> try  to pull everything, unfortunately =/
>>>>>
>>>>> Good way to find most is probably to just do a diff and compare.
>>>>>
>>>>> Mergin from branch to trunk can usually be done by "cvs merge" as  
>>>>> branch changes should generally all be pulled.
>>>>>
>>>>> -Brian
>>>>>
>>>>> On Jul 24, 2004, at 7:16 PM, Armin Waibel wrote:
>>>>>
>>>>>> Brian McCallister wrote:
>>>>>>
>>>>>>> branch -> trunk
>>>>>>> Only bug fixes go in branch, so any change in branch SHOULD be
 
>>>>>>> applied  to trunk as well.
>>>>>>> new development goes in trunk, so most changes probably SHOULD

>>>>>>> NOT be   applied to branch.
>>>>>>>
>>>>>>
>>>>>> Thanks Brian! Will do so in future (I will check in some more 
>>>>>> changes  to trunk today).
>>>>>> How do we get made changes from trunk to branch? Merge each 
>>>>>> changed  class from trunk to branch by hand?
>>>>>>
>>>>>>
>>>>>> regards,
>>>>>> Armin
>>>>>>
>>>>>>
>>>>>>> -Brian
>>>>>>> On Jul 24, 2004, at 6:37 PM, Armin Waibel wrote:
>>>>>>>
>>>>>>>> Brian McCallister wrote:
>>>>>>>>
>>>>>>>>> We'll need to port bug fixes into the OJB_1_0_RELEASE
branch 
>>>>>>>>> as  well  if we intend to release bug fixes off of that
branch. 
>>>>>>>>> That or   selectively merge changes.
>>>>>>>>>
>>>>>>>>
>>>>>>>> Add my changes to trunk only too - sorry.
>>>>>>>>
>>>>>>>>> I tend to be of the opinion that checking bug fixes into
the  
>>>>>>>>> current  bug fix branch, and merging to head is easier.

>>>>>>>>> Merging  from head to  bug fix branch is hard to separate
out 
>>>>>>>>> new  development.
>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>> I know we have merge problems with the first attempt of 
>>>>>>>> branching   (OJB_1_0_branch) some month ago, but I forget
what's 
>>>>>>>> the better way  to  go:
>>>>>>>> merge branch --> trunk
>>>>>>>> merge trunk --> branch
>>>>>>>>
>>>>>>>> regards
>>>>>>>> Armin
>>>>>>>>
>>>>>>>>> -Brian
>>>>>>>>> On Jul 24, 2004, at 4:10 PM, Jakob Braeuchi wrote:
>>>>>>>>>
>>>>>>>>>> hi brian,
>>>>>>>>>>
>>>>>>>>>> i only committed to the head. is this a problem ?
>>>>>>>>>>
>>>>>>>>>> jakob
>>>>>>>>>>
>>>>>>>>>> Brian McCallister schrieb:
>>>>>>>>>>
>>>>>>>>>>> We've had a few small bug fixes that have been
requested by 
>>>>>>>>>>> users   and fixed in CVS.
>>>>>>>>>>> I'm thinking we should push 1.0.1 off the OJB_1_0_RELEASE

>>>>>>>>>>> branch   soon so that people who needed these
can get them 
>>>>>>>>>>> without working   against CVS.
>>>>>>>>>>> Have fixes been applied in just HEAD or on the
1_0 branch as 
>>>>>>>>>>> well?
>>>>>>>>>>> -Brian
>>>>>>>>>>> ------------------------------------------------------------------

>>>>>>>>>>> -- -
>>>>>>>>>>> To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
>>>>>>>>>>> For additional commands, e-mail: ojb-dev-help@db.apache.org
>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>> -------------------------------------------------------------------

>>>>>>>>>> -- 
>>>>>>>>>> To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
>>>>>>>>>> For additional commands, e-mail: ojb-dev-help@db.apache.org
>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>> --------------------------------------------------------------------

>>>>>>>>> -
>>>>>>>>> To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
>>>>>>>>> For additional commands, e-mail: ojb-dev-help@db.apache.org
>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>> ---------------------------------------------------------------------

>>>>>>>>
>>>>>>>> To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
>>>>>>>> For additional commands, e-mail: ojb-dev-help@db.apache.org
>>>>>>>>
>>>>>>>>
>>>>>>> ---------------------------------------------------------------------

>>>>>>>
>>>>>>> To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
>>>>>>> For additional commands, e-mail: ojb-dev-help@db.apache.org
>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>> ---------------------------------------------------------------------
>>>>>> To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
>>>>>> For additional commands, e-mail: ojb-dev-help@db.apache.org
>>>>>>
>>>>>>
>>>>>
>>>>>
>>>>>
>>>>> ---------------------------------------------------------------------
>>>>> To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
>>>>> For additional commands, e-mail: ojb-dev-help@db.apache.org
>>>>>
>>>>>
>>>>>
>>>>
>>>> ---------------------------------------------------------------------
>>>> To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
>>>> For additional commands, e-mail: ojb-dev-help@db.apache.org
>>>>
>>>>
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
>>> For additional commands, e-mail: ojb-dev-help@db.apache.org
>>>
>>>
>>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
>> For additional commands, e-mail: ojb-dev-help@db.apache.org
>>
>>
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
> For additional commands, e-mail: ojb-dev-help@db.apache.org
> 
> 
> 

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org


Mime
View raw message