I apologize to the community for having sent out so many messages on
this topic and for having sown confusion. Here is where I thought we
ended up:
CODE - I was done mega-merging the trunk. I asked committers to double
commit to both the trunk and the 10.2 branch. I fear this is not
actually happening and I will have to sort this out soon.
DOCS - It was persuasively argued that only 10.2-related changes were
going into the 10.2 docs branch. So committers were absolved of the
responsibility of merging doc patches from the mainline to the 10.2 docs
branch. For docs, I volunteered to do another mega-merge.
Soon I will send out some more mail about the merges we need and about
the next candidate we want to build.
Regards,
-Rick
Jean T. Anderson wrote:
Daniel John Debrunner wrote:
Jean T. Anderson wrote:
Bryan Pendleton wrote:
I propose to commit DERBY-119 to the trunk within the next week.
http://issues.apache.org/jira/browse/DERBY-119
This is a new feature, and should not be merged to 10.2, but my
understanding is that all the mass-merging from the trunk to 10.2
is complete and it is ok to start putting new work into the trunk.
for the docs, Rick had just suggested adding any exclusions to the end
of http://wiki.apache.org/db-derby/TenTwoRelease :
http://mail-archives.apache.org/mod_mbox/db-derby-dev/200608.mbox/[EMAIL
PROTECTED]
(In fact the docs are easy because everything being committed to the
trunk right now is a mega merge candidate.)
At any rate, I *think* all you need to do is list your addition to that
Wiki page.
I thought the mega-merges had been completed? Rick said it was up to
individuals to merge items.
yep, you're right! I found Rick's post [1] which says:
From this point onward, the trunk is open to feature work which will
not go into 10.2. In addition, from now on, all 10.2 patches need to be
committed to both the trunk and the 10.2 branch.
-jean
[1]
http://mail-archives.apache.org/mod_mbox/db-derby-dev/200608.mbox/[EMAIL
PROTECTED]
