[U-Boot-Users] Any schedule or plan to publish your "testing" branch?

[U-Boot-Users] Any schedule or plan to publish your "testing" branch?

[Hong Xu]

Dear Mr.Scott Wood,

I noticed that you are now maintaining a custodian tree which is
focused on NAND support in u-boot. Could you please tell me is there
any schedule or plan to publish your "testing" tree?
Thanks.

BR,
Eric

[U-Boot-Users] Any schedule or plan to publish your "testing" branch?

[Wolfgang Denk]

In message <1516faed0808061802m6f02179dg8359a0caddb256ea@mail.gmail.com> you wrote:
> 
> I noticed that you are now maintaining a custodian tree which is
> focused on NAND support in u-boot. Could you please tell me is there
> any schedule or plan to publish your "testing" tree?

What do you mean by "publish"? The branch is public all the time. It's
available to everibode in the NAND custodian repository. See for
example
http://git.denx.de/?p=u-boot/u-boot-nand-flash.git;a=shortlog;h=refs/heads/testing

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Don't put off for tomorrow what you can  do  today,  because  if  you
enjoy it today you can do it again tomorrow.

[U-Boot-Users] Any schedule or plan to publish your "testing" branch?

[William Juul]

On Thu, Aug 7, 2008 at 7:34 AM, Wolfgang Denk <wd@denx.de> wrote:
>
> In message <1516faed0808061802m6f02179dg8359a0caddb256ea@mail.gmail.com> you wrote:
> >
> > I noticed that you are now maintaining a custodian tree which is
> > focused on NAND support in u-boot. Could you please tell me is there
> > any schedule or plan to publish your "testing" tree?
>
> What do you mean by "publish"? The branch is public all the time. It's
> available to everibode in the NAND custodian repository. See for
> example
> http://git.denx.de/?p=u-boot/u-boot-nand-flash.git;a=shortlog;h=refs/heads/testing

I guess Hong Xu would like to know if there is a plan for merging this
branch in the main U-boot git repository. And if so, how and when?
Scott Wood has already signaled that he intends to merge this branch,
but I would also like to know about any progress in this matter.

Best regards
William Juul
>
> Best regards,
>
> Wolfgang Denk
>
> --
> DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
> Don't put off for tomorrow what you can  do  today,  because  if  you
> enjoy it today you can do it again tomorrow.
>
> -------------------------------------------------------------------------
> This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
> Build the coolest Linux based applications with Moblin SDK & win great prizes
> Grand prize is a trip for two to an Open Source event anywhere in the world
> http://moblin-contest.org/redirect.php?banner_id=100&url=/
> _______________________________________________
> U-Boot-Users mailing list
> U-Boot-Users at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/u-boot-users

[U-Boot-Users] Any schedule or plan to publish your "testing" branch?

[Hong Xu]

On Thu, Aug 7, 2008 at 15:02, William Juul <william.juul@tandberg.com> wrote:
> On Thu, Aug 7, 2008 at 7:34 AM, Wolfgang Denk <wd@denx.de> wrote:
>>
>> In message <1516faed0808061802m6f02179dg8359a0caddb256ea@mail.gmail.com> you wrote:
>> >
>> > I noticed that you are now maintaining a custodian tree which is
>> > focused on NAND support in u-boot. Could you please tell me is there
>> > any schedule or plan to publish your "testing" tree?
>>
>> What do you mean by "publish"? The branch is public all the time. It's
>> available to everibode in the NAND custodian repository. See for
>> example
>> http://git.denx.de/?p=u-boot/u-boot-nand-flash.git;a=shortlog;h=refs/heads/testing
>
> I guess Hong Xu would like to know if there is a plan for merging this
> branch in the main U-boot git repository. And if so, how and when?
> Scott Wood has already signaled that he intends to merge this branch,
> but I would also like to know about any progress in this matter.

Yes, William hit the point. Actually It seems my work is based on two
different custodian trees, for example, Scott's NAND tree and
u-boot-at91 tree. If the 2 two trees do not merge each other,
sometimes I got screwed. I guess `git ' may help at this situation,
but I don't know how. :-)  I just wanted to know the status of the
NAND tree. Maybe I did not express myself clearly in the last email.

BR,
Eric

> Best regards
> William Juul
>>
>> Best regards,
>>
>> Wolfgang Denk
>>

[U-Boot-Users] Any schedule or plan to publish your "testing" branch?

[Wolfgang Denk]

In message <1516faed0808070027w4b9e0028j3790de9f8f094177@mail.gmail.com> you wrote:
>
> Yes, William hit the point. Actually It seems my work is based on two
> different custodian trees, for example, Scott's NAND tree and
> u-boot-at91 tree. If the 2 two trees do not merge each other,
> sometimes I got screwed. I guess `git ' may help at this situation,
> but I don't know how. :-)  I just wanted to know the status of the
> NAND tree. Maybe I did not express myself clearly in the last email.

You can create your own local development branch, and merge both  the
NAND testing branch and the at91 stuff into this branch. There may be
merge  conflicts,  of  course,  but  I  think  both  trees are pretty
orthogonal to each other, so chances for such conflicts are  probably
small.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Who is the oldest inhabitant of this village?"
"We haven't got one; we had one, but he died three weeks ago."

[U-Boot-Users] Any schedule or plan to publish your "testing" branch?

[Jerry Van Baren]

Wolfgang Denk wrote:
> In message <1516faed0808070027w4b9e0028j3790de9f8f094177@mail.gmail.com> you wrote:
>> Yes, William hit the point. Actually It seems my work is based on two
>> different custodian trees, for example, Scott's NAND tree and
>> u-boot-at91 tree. If the 2 two trees do not merge each other,
>> sometimes I got screwed. I guess `git ' may help at this situation,
>> but I don't know how. :-)  I just wanted to know the status of the
>> NAND tree. Maybe I did not express myself clearly in the last email.
> 
> You can create your own local development branch, and merge both  the
> NAND testing branch and the at91 stuff into this branch. There may be
> merge  conflicts,  of  course,  but  I  think  both  trees are pretty
> orthogonal to each other, so chances for such conflicts are  probably
> small.

...and if there *are* merge conflicts, you can contribute back to the 
u-boot list (a) that there is a pending conflict and (b) a resolution, 
if you have one.  Having the knowledge of a merge conflict *before* the 
merge window opens is useful.  Having a proposed resolution is even more 
useful.

Thanks,
gvb

[U-Boot-Users] Any schedule or plan to publish your "testing" branch?

[Scott Wood]

Hong Xu wrote:
> I noticed that you are now maintaining a custodian tree which is
> focused on NAND support in u-boot. Could you please tell me is there
> any schedule or plan to publish your "testing" tree?
> Thanks.

I hope to merge it during the next merge window.

-Scott