[Koha-bugs] [Bug 25387] Avoid merge different type of authorities

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

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

Thibault Keromnès <thibault.keromnes at univ-paris8.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |thibault.keromnes at univ-pari
                   |                            |s8.fr

--- Comment #17 from Thibault Keromnès <thibault.keromnes at univ-paris8.fr> ---
Tried on a sandbox, doesn't apply : 
TASK [Apply bug 25387 via git-bz in docker container]
**************************
fatal: [localhost -> koha-bz25387]: FAILED! => {"changed": true, "cmd": "cd
/kohadevbox/koha && yes | git bz apply 25387", "delta": "0:00:07.694919",
"end": "2022-09-08 14:15:09.992354", "msg": "non-zero return code", "rc": 1,
"start": "2022-09-08 14:15:02.297435", "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-25387-Merging-different-authority-types-create-RaNVft.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-25387-Merging-different-authority-types-create-RaNVft.patch"],
"stdout": "Applying: Bug 25387: Merging different authority types create no
warning\nUsing index info to reconstruct a base
tree...\nM\tkoha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc\nM\tkoha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt\nFalling
back to patching base and 3-way merge...\nAuto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt\nAuto-merging
koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc\nCONFLICT (content):
Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc\nPatch failed at 0001
Bug 25387: Merging different authority types create no warning\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\".\n\nBug 25387 - Avoid
merge different type of authorities\n\n126588 - Bug 25387: Merging different
authority types create no warning\n\nApply? [(y)es, (n)o, (i)nteractive] ",
"stdout_lines": ["Applying: Bug 25387: Merging different authority types create
no warning", "Using index info to reconstruct a base tree...",
"M\tkoha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc",
"M\tkoha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt", "Falling
back to patching base and 3-way merge...", "Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt", "Auto-merging
koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc", "CONFLICT
(content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc", "Patch failed at
0001 Bug 25387: Merging different authority types create no warning", "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\".", "", "Bug
25387 - Avoid merge different type of authorities", "", "126588 - Bug 25387:
Merging different authority types create no warning", "", "Apply? [(y)es, (n)o,
(i)nteractive] "]}

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