Rick Hillegas wrote:
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:
I am trying to get set up to merge stuff to the trunk and noticed that
the http://wiki.apache.org/db-derby/TenTwoRelease#preview wiki page
is now out of date. It needs some updating to talk about the branch.
I did some updates but probably it needs more.
I will search mail next but I was looking for the svn command to get
a codeline synced up to the branch, if anyone has it it handy let me
know. It probably belongs on the page somewhere.
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.