1.0 Branch for Firefox+Thunderbird

2 views
Skip to first unread message

Benjamin D. Smedberg

unread,
May 17, 2004, 5:25:31 AM5/17/04
to
We have cut a branch for Firefox and Thunderbird which will be used for
stable branch builds of these apps from now until the 1.0 releases of
these apps.

The branch is named AVIARY_1_0_20040515_BRANCH ; it is based off of the
MOZILLA_1_7_BRANCH .


To build firefox from the branch:

cvs co -r AVIARY_1_0_20040515_BRANCH mozilla/client.mk
cvs co -r AVIARY_1_0_20040515_BRANCH mozilla/browser/config

Insert your mozconfig as appropriate, and build as usual.

To see recent changes to the branch, use this link:

http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=all&branch=AVIARY_1_0_20040515_BRANCH&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=week&mindate=&maxdate=&cvsroot=%2Fcvsroot

Tinderboxen and nightly builds for the branch will be available early
this week.

--BDS

Boris Zbarsky

unread,
May 17, 2004, 11:20:58 AM5/17/04
to
Benjamin D. Smedberg wrote:
> We have cut a branch for Firefox and Thunderbird which will be used for
> stable branch builds of these apps from now until the 1.0 releases of
> these apps.
>
> The branch is named AVIARY_1_0_20040515_BRANCH ; it is based off of the
> MOZILLA_1_7_BRANCH .

So as a practical matter, do layout fixes landing on the 1.7 branch need to
separately land on this branch? Or will they be ported by ben/scott? Or did
the layout code not get branched?

Inquiring minds want to know,
Boris

Benjamin D. Smedberg

unread,
May 17, 2004, 12:34:18 PM5/17/04
to
Boris Zbarsky wrote:
> Benjamin D. Smedberg wrote:

> So as a practical matter, do layout fixes landing on the 1.7 branch need
> to separately land on this branch? Or will they be ported by
> ben/scott? Or did the layout code not get branched?

If you land layout fixes on the 1.7 branch, you are welcome to land them
on the ffox 1.0 branch as well. If you don't, mconnor or Ben or I will
try to watch the bonsai logs and do it.

--BDS

Darin Fisher

unread,
May 17, 2004, 2:21:53 PM5/17/04
to
Benjamin D. Smedberg wrote:


What is the approval process for landing changes on the Aviary 1.0 branch?

-Darin

Benjamin D. Smedberg

unread,
May 17, 2004, 2:35:13 PM5/17/04
to
Darin Fisher wrote:
> What is the approval process for landing changes on the Aviary 1.0 branch?

I'm making this up:

If a patch has approval1.7+ from drivers, it is also approved for the
aviary1.0 branch. Otherwise, it needs to be approved by one of the usual
aviary peers.

--BDS

Boris Zbarsky

unread,
May 17, 2004, 5:53:13 PM5/17/04
to
Benjamin D. Smedberg wrote:
> If you land layout fixes on the 1.7 branch, you are welcome to land them
> on the ffox 1.0 branch as well. If you don't, mconnor or Ben or I will
> try to watch the bonsai logs and do it.

Can we have a more formal system of notifying people of such patches, or
something? I certainly will not be in a position to have yet another tree to
build/test patches in before checkin any time soon, so I'm not likely to be
making any checkins to the aviary branch.

Further, you may want to clearly announce somewhere with wider distribution than
.builds what the deal with branch checkins is -- I can totally see people
assuming that 1.7 branch checkins will end up in aviary automagically (which
they may, if you guys are planning to spend a lot of time on watching bonsai,
but that sounds like a waste of your time).

-Boris

Brodie Thiesfield

unread,
May 22, 2004, 11:21:54 PM5/22/04
to
I can understand wanting to use a branch for Firefox since it is so
close to 1.0, however Thunderbird is still only at 0.6 It seems far too
early to be cutting a branch for it too.

Does this mean that fox/bird will alwas be on a separate branch now? If
not, what is going to be the plan for merging it back to trunk?

Brodie

Michael Lefevre

unread,
May 28, 2004, 8:02:08 PM5/28/04
to
On 2004-05-17, Boris Zbarsky <bzba...@mit.edu> wrote:
> Benjamin D. Smedberg wrote:
>> If you land layout fixes on the 1.7 branch, you are welcome to land them
>> on the ffox 1.0 branch as well. If you don't, mconnor or Ben or I will
>> try to watch the bonsai logs and do it.
>
> Further, you may want to clearly announce somewhere with wider distribution than
> .builds what the deal with branch checkins is -- I can totally see people
> assuming that 1.7 branch checkins will end up in aviary automagically (which
> they may, if you guys are planning to spend a lot of time on watching bonsai,
> but that sounds like a waste of your time).

Looks like nothing happened with this... as far as I can see, the aviary
branch is missing pretty much all the checkins that have happened since it
branched from 1.7, with the exception of something bryner checked in to
both.

Hopefully one of the Firefox folks will have the time to go back through
all the bonsai logs...

--
Michael

Reply all
Reply to author
Forward
0 new messages