Login | Register
My pages Projects Community openCollabNet

Discussions > dev > Re: [propel-dev] NestSet 1.3 branch merge

propel
Discussion topic

Back to topic list

Re: [propel-dev] NestSet 1.3 branch merge

Reply

Author =?ISO-8859-1?Q?David_Z=FClke?= <dz at bitxtender dot com>
Full name =?ISO-8859-1?Q?David_Z=FClke?= <dz at bitxtender dot com>
Date 2007-11-03 18:01:52 PDT
Message Did some testing, and looks good so far, but I think I'll do this
tomorrow at the conf, so Hans has the option to slap me right away if
I mess something up ;)


- David



Am 03.11.2007 um 21:55 schrieb David Zülke:

> Didn't :) Synced again. Dominik and I will perform some tests if any
> of the 1.3 stuff added in between causes wonkiness, and after that,
> I'll do the merge.
>
>
> David
>
>
>
> Am 03.11.2007 um 18:06 schrieb Hans Lellelid:
>
>> Hi David,
>>
>> Yeah, I keep committing new small changes to 1.3. Just to piss you
>> off
>> :) I don't expect that'll matter for your merge, though.
>>
>> Hans
>>
>> David Zülke wrote:
>>> "my" branch and 1.3 are in sync now. I gotta run now (shopping!),
>>> but I
>>> will merge my branch to 1.3 later in the evening.
>>>
>>>
>>> David
>>>
>>>
>>>
>>>
>>> Am 03.11.2007 um 17:01 schrieb Hans Lellelid:
>>>
>>>> Sounds like fun. :) I'm going to probably work on a few Propel
>>>> 1.3 bugs
>>>> too, but I'll avoid doing something like a code style cleanup on
>>>> the
>>>> builder classes ;)
>>>>
>>>> David Zülke wrote:
>>>>> Going through all changes right now to merge critical stuff by
>>>>> hand,
>>>>> but that takes some time. I also need to roll Agavi 0.11.0 later
>>>>> today
>>>>> and do some shopping, but I hope I can finish this today ;)
>>>>>
>>>>> David
>>>>>
>>>>>
>>>>>
>>>>> Am 03.11.2007 um 11:04 schrieb Eric Fredj:
>>>>>
>>>>>> No pb :-)
>>>>>>
>>>>>> I know what busy means :-D
>>>>>>
>>>>>> Heltem
>>>>>>
>>>>>> David Zülke a écrit :
>>>>>>> Sorry, sorry, I'll really get to this tomorrow (otherwise,
>>>>>>> Hans will
>>>>>>> be allowed to slap me in the face when we meet at the
>>>>>>> conference). I
>>>>>>> really have a strong interest in getting this merged, so no
>>>>>>> worries ;)
>>>>>>> Sorry for the holdup.
>>>>>>>
>>>>>>> David
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>> Am 02.11.2007 um 20:18 schrieb Eric Fredj:
>>>>>>>
>>>>>​>>> Hi,
>>>>>​>>>
>>>>>​>>> Anyone sees any problem with the merge between heltem/ and 1.3/
>>>>>​>>>
>>>>>​>>> David ?
>>>>>​>>>
>>>>>​>>> Eric Fredj a écrit :
>>>>>​>>>> Did someone have time to see if multi-nestedset can be
>>>>>​>>>> merged in 1.3
>>>>>​>>>> (david-multi_nested_set_tables/ or heltem/ branch) ?
>>>>>​>>>>
>>>>>​>>>> I really think we should merge multi-nestedset support.
>>>>>​>>>>
>>>>>​>>>> David > If you prefer, you can merge your branch and then I
>>>>>​>>>> will
>>>>>​>>>> apply
>>>>>​>>>> my diff changes
>>>>>​>>>>
>>>>>​>>>> Regards,
>>>>>​>>>>
>>>>>​>>>> Heltem
>>>>>>
>>>>>> --------------------​--------------------​--------------------​---------
>>>>>> To unsubscribe, e-mail: dev-unsubscribe@prop​el.tigris.org
>>>>>> For additional commands, e-mail: dev-help at propel dot tigris dot org
>>>>>>
>>>>>>
>>>>>
>>>>> --------------------​--------------------​--------------------​---------
>>>>> To unsubscribe, e-mail: dev-unsubscribe@prop​el.tigris.org
>>>>> For additional commands, e-mail: dev-help at propel dot tigris dot org
>>>>>
>>>>
>>>> --------------------​--------------------​--------------------​---------
>>>> To unsubscribe, e-mail: dev-unsubscribe@prop​el.tigris.org
>>>> For additional commands, e-mail: dev-help at propel dot tigris dot org
>>>>
>>>>
>>>
>>> --------------------​--------------------​--------------------​---------
>>> To unsubscribe, e-mail: dev-unsubscribe@prop​el.tigris.org
>>> For additional commands, e-mail: dev-help at propel dot tigris dot org
>>>
>>
>> --------------------​--------------------​--------------------​---------
>> To unsubscribe, e-mail: dev-unsubscribe@prop​el.tigris.org
>> For additional commands, e-mail: dev-help at propel dot tigris dot org
>>
>>
>
> --------------------​--------------------​--------------------​---------
> To unsubscribe, e-mail: dev-unsubscribe@prop​el.tigris.org
> For additional commands, e-mail: dev-help at propel dot tigris dot org
>
>

« Previous message in topic | 30 of 31 | Next message in topic »

Messages

Show all messages in topic

PHP5NestedSetPeerBuilder slightly broken (PATCH attached) Felix Gilcher <propel at andersground dot net> Felix Gilcher <propel at andersground dot net> 2007-10-17 01:38:33 PDT
     Re: [propel-dev] PHP5NestedSetPeerBuilder slightly broken (PATCH attached) Cameron Brunner <cameron dot brunner at gmail dot com> Cameron Brunner <cameron dot brunner at gmail dot com> 2007-10-17 02:25:32 PDT
         Re: [propel-dev] PHP5NestedSetPeerBuilder slightly broken (PATCH attached) =?ISO-8859-1?Q?David_Z=FClke?= <dz at bitxtender dot com> =?ISO-8859-1?Q?David_Z=FClke?= <dz at bitxtender dot com> 2007-10-23 07:09:31 PDT
             Re: [propel-dev] PHP5NestedSetPeerBuilder slightly broken (PATCH attached) hlellelid Hans Lellelid 2007-10-23 07:10:52 PDT
                 Re: [propel-dev] PHP5NestedSetPeerBuilder slightly broken (PATCH attached) =?ISO-8859-1?Q?David_Z=FClke?= <dz at bitxtender dot com> =?ISO-8859-1?Q?David_Z=FClke?= <dz at bitxtender dot com> 2007-10-23 07:14:55 PDT
                     Re: [propel-dev] PHP5NestedSetPeerBuilder slightly broken (PATCH attached) hlellelid Hans Lellelid 2007-10-23 07:16:37 PDT
                         Re: [propel-dev] PHP5NestedSetPeerBuilder slightly broken (PATCH attached) =?ISO-8859-1?Q?David_Z=FClke?= <dz at bitxtender dot com> =?ISO-8859-1?Q?David_Z=FClke?= <dz at bitxtender dot com> 2007-10-23 07:17:53 PDT
                             [propel-dev] NestSet 1.3 branch merge Eric Fredj <eofredj at gmail dot com> Eric Fredj <eofredj at gmail dot com> 2007-10-25 18:41:29 PDT
                                 Re: [propel-dev] NestSet 1.3 branch merge Eric Fredj <eofredj at gmail dot com> Eric Fredj <eofredj at gmail dot com> 2007-10-25 18:46:37 PDT
                                     Re: [propel-dev] NestSet 1.3 branch merge Eric Fredj <eofredj at gmail dot com> Eric Fredj <eofredj at gmail dot com> 2007-10-26 05:06:55 PDT
                                         Re: [propel-dev] NestSet 1.3 branch merge =?ISO-8859-1?Q?David_Z=FClke?= <dz at bitxtender dot com> =?ISO-8859-1?Q?David_Z=FClke?= <dz at bitxtender dot com> 2007-10-27 19:42:26 PDT
                                             Re: [propel-dev] NestSet 1.3 branch merge hlellelid Hans Lellelid 2007-10-27 20:11:42 PDT
                                                 Re: [propel-dev] NestSet 1.3 branch merge =?ISO-8859-1?Q?David_Z=FClke?= <dz at bitxtender dot com> =?ISO-8859-1?Q?David_Z=FClke?= <dz at bitxtender dot com> 2007-10-27 20:37:26 PDT
                                             Re: [propel-dev] NestSet 1.3 branch merge Frank Stelzer <dev at bleedingmoon dot de> Frank Stelzer <dev at bleedingmoon dot de> 2007-10-28 00:29:48 PDT
                                                 Re: [propel-dev] NestSet 1.3 branch merge =?ISO-8859-1?Q?David_Z=FClke?= <dz at bitxtender dot com> =?ISO-8859-1?Q?David_Z=FClke?= <dz at bitxtender dot com> 2007-10-28 03:57:10 PDT
                                                     Re: [propel-dev] NestSet 1.3 branch merge Eric Fredj <eofredj at gmail dot com> Eric Fredj <eofredj at gmail dot com> 2007-10-28 04:33:50 PDT
                                                     Re: [propel-dev] NestSet 1.3 branch merge Eric Fredj <eofredj at gmail dot com> Eric Fredj <eofredj at gmail dot com> 2007-10-28 04:39:16 PDT
                                                         Re: [propel-dev] NestSet 1.3 branch merge Eric Fredj <eofredj at gmail dot com> Eric Fredj <eofredj at gmail dot com> 2007-10-30 05:44:48 PDT
                                                             Re: [propel-dev] NestSet 1.3 branch merge Eric Fredj <eofredj at gmail dot com> Eric Fredj <eofredj at gmail dot com> 2007-11-02 12:18:04 PDT
                                                                 Re: [propel-dev] NestSet 1.3 branch merge =?ISO-8859-1?Q?David_Z=FClke?= <dz at bitxtender dot com> =?ISO-8859-1?Q?David_Z=FClke?= <dz at bitxtender dot com> 2007-11-02 14:03:03 PDT
                                                                     Re: [propel-dev] NestSet 1.3 branch merge Eric Fredj <eofredj at gmail dot com> Eric Fredj <eofredj at gmail dot com> 2007-11-03 03:04:21 PDT
                                                                         Re: [propel-dev] NestSet 1.3 branch merge hlellelid Hans Lellelid 2007-11-03 08:36:24 PDT
                                                                             Re: [propel-dev] NestSet 1.3 branch merge Eric Fredj <eofredj at gmail dot com> Eric Fredj <eofredj at gmail dot com> 2007-11-03 08:49:03 PDT
                                                                                 Re: [propel-dev] NestSet 1.3 branch merge hlellelid Hans Lellelid 2007-11-03 08:50:24 PDT
                                                                         Re: [propel-dev] NestSet 1.3 branch merge =?ISO-8859-1?Q?David_Z=FClke?= <dz at bitxtender dot com> =?ISO-8859-1?Q?David_Z=FClke?= <dz at bitxtender dot com> 2007-11-03 09:00:40 PDT
Page: of 2 « Previous | Next »
Messages per page: