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-10-27 20:37:26 PDT
Message yeah but I think he branched 1.3, then applied the patch he sent which
seems to be a merge of my branch to 1.3 plus custom stuff... that's
gonna make things pretty complicated to merge, especially when syncing
changes. I don't really get it, but I'll just merge my branch in
tomorrow as planned :p

David



Am 28.10.2007 um 04:11 schrieb Hans Lellelid:

> I was confused by that branch off of the branch too :) I guess Eric
> just wants to keep you in tip-top SVN merge shape :)
>
> Hans
>
> David Zülke wrote:
>> Errr... why didn't you branch off my branch? Now things are gonna be
>> complicated.
>>
>> Also, I don't get this whole sfPropelActAsNestedS​etBehaviourPlugin
>> stuff, care to explain?
>>
>>
>> David
>>
>>
>>
>>
>> Am 26.10.2007 um 14:06 schrieb Eric Fredj:
>>
>>> I created a /heltem /branch to commit my Nestedset changes to avoid
>>> conflict on your branch if you planned some changes on it before
>>> merge
>>> in 1.3.
>>>
>>> That way, users can test my changes easily.
>>>
>>> I am currently working in sfPropelActAsNestedS​etBehaviourPlugin
>>> port to
>>> Propel core to support it natively.
>>>
>>> Regards,
>>> Heltem
>>>
>>> Eric Fredj a écrit :
>>>> Integrated PropelPDO in node runtime classes and builders too ;-)
>>>>
>>>> Eric Fredj a écrit :
>>>>
>>>>> David,
>>>>>
>>>>> I made a merge for 1.3 branch and yours on my dev host.
>>>>> I will submit it to you before commit it.
>>>>> I applied all david-multi_nested_set_tables changes and some of
>>>>> mine
>>>>> on 1.3.
>>>>>
>>>>> Moreover, I tried to follow API defined in
>>>>> sfPropelActAsNestedS​etBehaviorPlugin ...
>>>>>
>>>>> Waiting for your feedback. :-)
>>>>>
>>>>> Patch is attached.
>>>>>
>>>>> 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
>
>

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

Messages

Show all messages in topic

                                                                             Re: [propel-dev] NestSet 1.3 branch merge hlellelid Hans Lellelid 2007-11-03 09:01:47 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:40:29 PDT
                                                                                     Re: [propel-dev] NestSet 1.3 branch merge hlellelid Hans Lellelid 2007-11-03 10:06:51 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 13:55:15 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 18:01:52 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:40:11 PDT
Page: of 2 « Previous | Next »
Messages per page: