Attachment 99003 Details for Bug 24475 – error message

error message

apply error.txt (text/plain), 3.53 KB, created by Andrew Fuerste-Henry on 2020-02-14 18:31:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Fuerste-Henry

Created: 2020-02-14 18:31:42 UTC

Size: 3.53 KB

patch

obsolete

>{\rtf1\ansi\ansicpg1252\cocoartf2511
>\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 Monaco;}
>{\colortbl;\red255\green255\blue255;\red199\green200\blue201;\red22\green21\blue22;}
>{\*\expandedcolortbl;;\cssrgb\c81961\c82353\c82745;\cssrgb\c11373\c10980\c11373\c3922;}
>\margl1440\margr1440\vieww10800\viewh8400\viewkind0
>\deftab720
>\pard\pardeftab720\sl360\partightenfactor0
>
>\f0\fs24 \cf2 \cb3 \expnd0\expndtw0\kerning0
>\outl0\strokewidth0 \strokec2 root@9bdcbf79c656:koha(bug24475-qa)$ git qa 24475\cb1 \
>\cb3 Note: checking out 'origin/master'.\
>\pard\pardeftab720\sl360\partightenfactor0
>\cf2 \cb1 \
>\pard\pardeftab720\sl360\partightenfactor0
>\cf2 \cb3 You are in 'detached HEAD' state. You can look around, make experimental\cb1 \
>\cb3 changes and commit them, and you can discard any commits you make in this\cb1 \
>\cb3 state without impacting any branches by performing another checkout.\
>\pard\pardeftab720\sl360\partightenfactor0
>\cf2 \cb1 \
>\pard\pardeftab720\sl360\partightenfactor0
>\cf2 \cb3 If you want to create a new branch to retain commits you create, you may\cb1 \
>\cb3 do so (now or later) by using -b with the checkout command again. Example:\
>\pard\pardeftab720\sl360\partightenfactor0
>\cf2 \cb1 \
>\pard\pardeftab720\sl360\partightenfactor0
>\cf2 \cb3   git checkout -b <new-branch-name>\
>\pard\pardeftab720\sl360\partightenfactor0
>\cf2 \cb1 \
>\pard\pardeftab720\sl360\partightenfactor0
>\cf2 \cb3 HEAD is now at 7c9680749f... Bug 22898: Fix failure since bug 19618\cb1 \
>\cb3 fatal: A branch named 'bug24475-qa' already exists.\cb1 \
>\cb3 Deleted branch bug24475-qa (was 7c9680749f).\cb1 \
>\cb3 Branch bug24475-qa set up to track remote branch master from origin.\cb1 \
>\cb3 Switched to a new branch 'bug24475-qa'\
>\pard\pardeftab720\sl360\partightenfactor0
>\cf2 \cb1 \
>\pard\pardeftab720\sl360\partightenfactor0
>\cf2 \cb3 Bug 24475 Depends on bug 21633\cb1 \
>\cb3 Follow? [(y)es, (n)o] y\cb1 \
>\cb3 Bug 21633 - Did finesMode = test ever send email?\
>\pard\pardeftab720\sl360\partightenfactor0
>\cf2 \cb1 \
>\pard\pardeftab720\sl360\partightenfactor0
>\cf2 \cb3 97809 - Bug 21633: Remove finesMode 'test'\cb1 \
>\cb3 97810 - Bug 21633: (follow-up) Cleanup other values for finesMode\
>\pard\pardeftab720\sl360\partightenfactor0
>\cf2 \cb1 \
>\pard\pardeftab720\sl360\partightenfactor0
>\cf2 \cb3 Apply? [(y)es, (n)o, (i)nteractive] y\cb1 \
>\cb3 Applying: Bug 21633: Remove finesMode 'test'\cb1 \
>\cb3 Applying: Bug 21633: (follow-up) Cleanup other values for finesMode\cb1 \
>\cb3 Bug 24475 - Reword FinesMode system preference\
>\pard\pardeftab720\sl360\partightenfactor0
>\cf2 \cb1 \
>\pard\pardeftab720\sl360\partightenfactor0
>\cf2 \cb3 97984 - Bug 24475: Reword FinesMode system preference\
>\pard\pardeftab720\sl360\partightenfactor0
>\cf2 \cb1 \
>\pard\pardeftab720\sl360\partightenfactor0
>\cf2 \cb3 Apply? [(y)es, (n)o, (i)nteractive] y\cb1 \
>\cb3 Applying: Bug 24475: Reword FinesMode system preference\cb1 \
>\cb3 error: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref).\cb1 \
>\cb3 error: could not build fake ancestor\cb1 \
>\cb3 Patch failed at 0001 Bug 24475: Reword FinesMode system preference\cb1 \
>\cb3 The copy of the patch that failed is found in: .git/rebase-apply/patch\cb1 \
>\cb3 When you have resolved this problem run "git bz apply --continue".\cb1 \
>\cb3 If you would prefer to skip this patch, instead run "git bz apply --skip".\cb1 \
>\cb3 To restore the original branch and stop patching run "git bz apply --abort".\cb1 \
>\cb3 Patch left in /tmp/Bug-24475-Reword-FinesMode-system-preference-dvHaqG.patch\
>}

Actions: View

Attachments on bug 24475: 97954 | 97984 | 99003 | 101780 | 101800 | 101811 | 101812