[Koha-bugs] [Bug 33462] Force password change for new patrons entered by staff

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33462

Christopher Brannon <cbrannon at cdalibrary.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Failed QA

--- Comment #9 from Christopher Brannon <cbrannon at cdalibrary.org> ---
I'm getting a merge failure in the sandbox on this bug.

TASK [Apply bug 33462 via git-bz in docker container]
**************************
fatal: [localhost -> koha-bug33462]: FAILED! => {"changed": true, "cmd":
"koha-shell -c 'cd /kohadevbox/koha && yes | git bz apply 33462' bug33462",
"delta": "0:00:03.143844", "end": "2023-08-04 15:49:21.744724", "msg":
"non-zero return code", "rc": 1, "start": "2023-08-04 15:49:18.600880",
"stderr": "error: Failed to merge in the changes.\nhint: Use 'git am
--show-current-patch=diff' to see the failed patch\nPatch left in
/tmp/Bug-33462-Unit-Tests-4t46gml6.patch", "stderr_lines": ["error: Failed to
merge in the changes.", "hint: Use 'git am --show-current-patch=diff' to see
the failed patch", "Patch left in /tmp/Bug-33462-Unit-Tests-4t46gml6.patch"],
"stdout": "\nBug 33462 - Force password change for new patrons entered by
staff\n\n153687 - Bug 33462: Unit Tests\n153688 - Bug 33462: Update Schema
Files [DO NOT PUSH]\n153689 - Bug 33462: Add ability to force password change
for new patrons entered by staff\n\nApply? [(y)es, (n)o, (i)nteractive]
Applying: Bug 33462: Unit Tests\nUsing index info to reconstruct a base
tree...\nM\tt/db_dependent/Koha/Patron.t\nFalling back to patching base and
3-way merge...\nAuto-merging t/db_dependent/Koha/Patron.t\nCONFLICT (content):
Merge conflict in t/db_dependent/Koha/Patron.t\nPatch failed at 0001 Bug 33462:
Unit Tests\nWhen you have resolved this problem run \"git bz apply
--continue\".\nIf you would prefer to skip this patch, instead run \"git bz
apply --skip\".\nTo restore the original branch and stop patching run \"git bz
apply --abort\".", "stdout_lines": ["", "Bug 33462 - Force password change for
new patrons entered by staff", "", "153687 - Bug 33462: Unit Tests", "153688 -
Bug 33462: Update Schema Files [DO NOT PUSH]", "153689 - Bug 33462: Add ability
to force password change for new patrons entered by staff", "", "Apply? [(y)es,
(n)o, (i)nteractive] Applying: Bug 33462: Unit Tests", "Using index info to
reconstruct a base tree...", "M\tt/db_dependent/Koha/Patron.t", "Falling back
to patching base and 3-way merge...", "Auto-merging
t/db_dependent/Koha/Patron.t", "CONFLICT (content): Merge conflict in
t/db_dependent/Koha/Patron.t", "Patch failed at 0001 Bug 33462: Unit Tests",
"When you have resolved this problem run \"git bz apply --continue\".", "If you
would prefer to skip this patch, instead run \"git bz apply --skip\".", "To
restore the original branch and stop patching run \"git bz apply --abort\"."]}

Sam, can you please check.

-- 
You are receiving this mail because:
You are watching all bug changes.