[55] in athena10
Re: Athena repository ground rules
daemon@ATHENA.MIT.EDU (Greg Hudson)
Mon Jan 28 12:02:15 2008
Date: Mon, 28 Jan 2008 12:01:32 -0500
Message-Id: <200801281701.m0SH1WKE016443@equal-rites.mit.edu>
From: Greg Hudson <ghudson@MIT.EDU>
To: Greg Hudson <ghudson@MIT.EDU>
CC: athena10@MIT.EDU
In-reply-to: <200801150909.m0F99WDF022708@equal-rites.mit.edu>
A few clarifications:
> Instead, people should watch for svn commits to the source-commits
> list and, time permitting, review them.
I've been asked where comments should go if people find issues with
patches; the answer for the moment is this list (athena10).
Also, on the relationship between the SVN and CVS repositories: it may
be useful to pretend that we were using one repository with a "trunk"
(the SVN head) and a 9.4 release branch (the CVS head). Changes fall
into three categories:
1. A change which should go into the trunk code which we have no
motivation to deploy in 9.4. This will go into SVN and not CVS.
Example: the xcluster port fallback change I committed on Saturday.
2. A change which is going into 9.4 and applies to part of the tree
we aren't planning to build for Athena 10. This will go into CVS and
not SVN. Example: bumping the Firefox spec file version number as Bob
did on Dec 17.
3. A change which is going into 9.4 and applies to part of the tree
we are building for Athena 10. This should be committed to both, just
as we would commit to trunk and backport to the release branch if we
were using a single version control system. Example: the liblocker
fix Bob committed on Dec 17.