On 06/18/10 19:41, Jens-Heiner Rechtien wrote:
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.
*) 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.
Just to be sure: "Dummy merge" won't work for files added on OOO330.
-Stephan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@openoffice.org
For additional commands, e-mail: dev-h...@openoffice.org
