[Octave-bug-tracker] [bug #58376] Request for better looking tex superscripts and subscripts

[Rik]

Follow-up Comment #13, bug #58376 (project octave):

:), no problem.

For background, 'hg help graft'


hg graft [OPTION]... [-r REV]... REV...

copy changes from other branches onto the current branch

    This command uses Mercurial's merge logic to copy individual changes from
    other branches without merging branches in the history graph. This is
    sometimes known as 'backporting' or 'cherry-picking'. By default, graft
    will copy user, date, and description from the source changesets.


'hg graft' is now the preferred way to move changesets between branches.

Go somewhere where you have a Mercurial source tree, and then


hg branch stable   # switch to stable branch
hg update          # make sure we're at the head
hg log -u pantxo   # get a list of your recent changesets
-- I see --
changeset:   28305:6e8d5c99263c
user:        Pantxo Diribarne <address@hidden>
date:        Sat May 16 15:53:42 2020 +0200
summary:     Produce better looking TeX superscript and subscripts (bug
#58376).
----------
hg graft -r 28305


Technically, we're done with the graft now.  But I'd like to clean the tree
and make sure Mercurial understands there are no outstanding changes.


hg branch default  # switch back to development branch
hg merge stable    # merge changes
------
At this point, I had to remove the update about superscripts/subscripts
in the NEWS file on the development branch.  These changes are now in the
NEWS file for version 6, and so for version 7 they will be located in
the archive file etc/NEWS.6 (Mercurial understood this automatically).
------
hg ci -m 'maint: merge stable to default'   # check-in all changes


See https://hg.savannah.gnu.org/hgweb/octave/rev/768ae9b1a67c for graft cset.

See https://hg.savannah.gnu.org/hgweb/octave/rev/7a1736f89c6b for merge cset.




    _______________________________________________________

Reply to this item at:

  <https://savannah.gnu.org/bugs/?58376>

_______________________________________________
  Message sent via Savannah
  https://savannah.gnu.org/