Comments on: Branch diagram, including the new FF3.1 project branch

By: Samuel Sidler

Samuel Sidler — Tue, 25 Nov 2008 03:13:23 +0000

Oh, and actually, Mozilla 1.8 is not a descendent of Mozilla 1.8.0. It’s the other way around… Mozilla 1.8 (really, 1.8.1) was like a “trunk” and Mozilla 1.8.0 branched off of it.

By: Gavin Sharp

Gavin Sharp — Tue, 25 Nov 2008 00:03:21 +0000

Minor nit: IIRC Mozilla 1.8.0 branched off Mozilla 1.8, and not the other way around. We started off with a single 1.8 branch (MOZILLA_1_8_BRANCH) and then created 1.8.0 (MOZILLA_1_8_0_BRANCH) to continue the 1.5.0.x series when 2.0 development needed to continue.

By: John

John — Mon, 24 Nov 2008 17:00:30 +0000

hi bsmedberg;

Whether a branch has:
- one-way merges from mozilla-central (like the new mozilla-1.9.1, or like cvs-head)
- two-way merges from mozilla-central *and* merges back to mozilla-central (like tracemonkey)
…seems to be more a characteristic of the role of that branch to the human developers, regardless of whether the underlying SCM implements it as an actual branch or a clone.

And yes, you are correct – no matter how many ways I tried, showing any of those dotted lines of merges going back and forth quick turned this 2″ by 2″ diagram into a completely unreadable mess.

tc
John.

By: Samuel Sidler

Samuel Sidler — Mon, 24 Nov 2008 16:56:53 +0000

Nit picking a little more… “mozilla-1.8″ is really “mozilla-1.8.1″ even though the branch is still listed as MOZILLA_1_8_BRANCH. (Hence the Gecko version string of 1.8.1.19, for example.)

Also, “cvs trunk” is that, but it’s also the 1.9.0 branch, just not a “branch” in the |cvs tag -b -r| sense.

By: Benjamin Smedberg

Benjamin Smedberg — Mon, 24 Nov 2008 14:36:19 +0000

To nitpick the branching diagram

The project trees (such as actionmonkey/tracemonkey) are not branches in the normal way: because they are frequently merging with -central, it’s more like:

mozilla-central ———————————
\ \ \ / \ /
tracemonkey —————————- (end of project tree)

Of course, actually showing this on your pretty diagram might be more confusing than useful.