Hi,
as already announced, we'll branch off OOO330 (OOo-3.3 release code
line) from DEV300 (main development code line) after the finalization of
milestone DEV300 m84.
Release Engineering will handle the migration of OOO330 release code
line bug fixes/changes to DEV300 slightly different this time. This
should not affect development in any way, but it might be worthwhile to
be aware of the change.
Since the introduction of the CWS system many years ago RE merged each
release code line CWS individually into the main code line. This worked
usually quite well but was occasionally a bit tedious.
From now on we'll pull/merge summarily all OOO330 changesets into
DEV300 as first thing at the start of a new DEV300 milestone. This
ensures that there is no way that an OOO330 CWS or masterfix is
forgotten. We also won't need to track the integrate status of each
OOO330 CWS for DEV300 anymore, thus there will be no more new
mycws_DEV300 entries in EIS.
But wait, what if some OOO330 changesets should not be merged in DEV300?
These changesets will be either dummy merged* into DEV300 or merged and
immediately backed out with an inverse patch. Thus *all* OOO330
changesets will be in DEV300 but a few of them might not have an effect
on the code line.
Please, if you have OOO330 stuff which shouldn't be applied on DEV300
bundle it in it's own dedicated CWS and tell us about it (email and CWS
comment) so that we can pull and dummy merge this CWS first before we
get the changesets via the summarily pull/merge of the latest OOO330
milestone. This approach doesn't differ from what we had before - we
always demanded that a CWS is either completely merged or not at all -
and experience tells us that it's seldom a problem.
What happens if the release code line and the development code line
differ so much that pull/merging OOO330-DEV300 results in conflicts
that RE can't easily resolve? Well, RE might ask you to update your
(already OOO330 integrated) CWS with the latest stuff from DEV300 which
is then pull/merged by us before the rest of OOO330 is pull/merged. So
it might be a wise idea to not immediately delete your local copy of
your freshly integrated OOO330 CWS - just wait until the stuff is also
in DEV300. Anyway, it's still a bad idea to do wild feature
development/restructuring/refactoring on a release code line but now you
and not RE will do the cleanup :-)
Lastly: RE will do always complete builds on DEV300 milestones from now
on. No need to mark modules as incompatible anymore on DEV300. OOO330,
on the other hand, is handled like before.
Best regards,
Heiner
*) dummy merge: pull a few changesets and configure in .hgrc
[ui] merge = internal:local
before doing the merge. This way all changes from the pulled changesets
are discarded but the changesets are still recorded as merged.
--
Jens-Heiner Rechtien
jens-heiner.recht...@sun.com
Registered Office: Sun Microsystems GmbH, Sonnenallee 1, D-85551
Kirchheim-Heimstetten
Commercial register of the Local Court of Munich: HRB 161028
Managing Directors: Jürgen Kunz
-
To unsubscribe, e-mail: dev-unsubscr...@openoffice.org
For additional commands, e-mail: dev-h...@openoffice.org
