Sure – thanks, Rick.
DERBY-5900.diff to documentation trunk at revision 1372463.
Merged to 10.9 doc branch at revision 1372469.
Merged to 10.8 doc branch at revision 1372479.
Because of some formatting fixes introduced in 10.8, merging to 10.7 (or earlier) results in a conflict:
jdench 86 =>svn merge --dry-run -r 1372462:1372463 https://svn.apache.org/repos/asf/db/derby/docs/trunk/
— Merging r1372463 into '.':
Summary of conflicts:
Text conflicts: 1
The reason is that the patch is from one line with <i> tags to another –
-values are <i>'SEQUENCE'</i> and <i>'USER-DEFINED TYPE'</i>.</entry>
+values are <i>'SEQUENCE'</i> and <i>'TYPE'</i>.</entry>
but in 10.7/10.6 there are no <i> tags:
values are 'SEQUENCE' and 'USER-DEFINED TYPE'.</entry>
Should I just make the changes in these two branches and commit them without merging, or is there a merge command option that would get around this?