Login | Register
My pages Projects Community openCollabNet

propel
Reply to message

* = Required fields
* Subject
* Body
Attachments
Send reply to
Topic
Author (directly in email)
Please type the letters in the image above.

Original message

Author =?ISO-8859-1?Q?David_Z=FClke?= <dz@bitxtender.com>
Full name =?ISO-8859-1?Q?David_Z=FClke?= <dz@bitxtender.com>
Date 2007-11-03 13:55:15 PDT
Message 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
>
>