Attachment 155722 Details for Bug 118526 – git backport to 6.3

git backport to 6.3

gitbackport.txt (text/plain), 1.30 KB, created by Jim Raykowski on 2019-11-12 06:59:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jim Raykowski

Created: 2019-11-12 06:59:46 UTC

Size: 1.30 KB

patch

obsolete

>git checkout -b local-6-3 --no-track refs/remotes/origin/libreoffice-6-3
>    Switched to a new branch 'local-6-3'
>
>git cherry-pick -x 6b888ac476fe6ac2ee96c7086cb8c24249f08473
>    error: could not apply 6b888ac476fe... Reload Notebookbar, when customization is being done.
>    hint: after resolving the conflicts, mark the corrected paths
>    hint: with 'git add <paths>' or 'git rm <paths>'
>    hint: and commit the result with 'git commit'
>
>git diff
>    * Unmerged path cui/source/customize/SvxNotebookbarConfigPage.cxx
>
>This file wasn't in 6.3 and isn't required for the crash fix patch to work so remove it and commit
>
>git rm cui/source/customize/SvxNotebookbarConfigPage.cxx
>    cui/source/customize/SvxNotebookbarConfigPage.cxx: needs merge
>    rm 'cui/source/customize/SvxNotebookbarConfigPage.cxx'
>
>git commit
>    [local-6-3 aa97361d87f3] Reload Notebookbar, when customization is being done.
>    Author: Sumit Chauhan <sumitcn25@gmail.com>
>    Date: Mon Jun 10 15:47:55 2019 +0530
>    4 files changed, 33 insertions(+), 12 deletions(-)
>
>git cherry-pick -x 4ae5fe896e96d082e21788ae6d42a67133567ba7
>    [local-6-3 5bba679088c4] tdf#118526 Reload Notebookbar if read mode has switched
>    Author: Jim Raykowski <raykowj@gmail..com>
>    Date: Sat Nov 9 16:07:09 2019 -0900
>    1 file changed, 1 insertion(+), 1 deletion(-)

Actions: View

Attachments on bug 118526: 143294 | 147410 | 151667 | 155722