db-derby-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Kim Haase (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (DERBY-5900) Need to correct Reference Guide description of contents of SYS.SYSPERMS.OBJECTTYPE
Date Mon, 13 Aug 2012 16:12:38 GMT

    [ https://issues.apache.org/jira/browse/DERBY-5900?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13433242#comment-13433242

Kim Haase commented on DERBY-5900:

Sure -- thanks, Rick.

Committed patch 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 '.':
C    src/ref/rrefsistabssysperms.dita
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?
> Need to correct Reference Guide description of contents of SYS.SYSPERMS.OBJECTTYPE
> ----------------------------------------------------------------------------------
>                 Key: DERBY-5900
>                 URL: https://issues.apache.org/jira/browse/DERBY-5900
>             Project: Derby
>          Issue Type: Bug
>          Components: Documentation
>    Affects Versions:
>            Reporter: Rick Hillegas
>            Assignee: Kim Haase
>         Attachments: DERBY-5900.diff, rrefsistabssysperms.html
> The Reference Guide section on SYS.SYSPERMS says that the OBJECTTYPE column can take
the following values:
> This is not correct. The legal values are:

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira


View raw message