[Koha-bugs] [Bug 5791] Robust handling of deleted biblios/authorities

bugzilla-daemon at bugs.koha-community.org bugzilla-daemon at bugs.koha-community.org
Fri Apr 8 10:16:49 CEST 2011


http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5791

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |katrin.fischer at bsz-bw.de
       Patch Status|Needs Signoff               |Failed QA

--- Comment #7 from MJ Ray (software.coop) <mjr at ttllp.co.uk> 2011-04-03 23:22:32 UTC ---
This bug is mentioned in:
[Bug 5791] Robust handling of deleted    biblios/authorities
http://lists.koha-community.org/pipermail/koha-patches/2011-March/014012.html
[Bug 5791] Robust handling of    deleted biblios/authorities
http://lists.koha-community.org/pipermail/koha-patches/2011-March/014014.html
[Bug 5791] (2/2) Error handling for    ISBDdetail, MARCdetail and
labeledMARCdetail
http://lists.koha-community.org/pipermail/koha-patches/2011-March/014013.html

--- Comment #8 from Katrin Fischer <katrin.fischer at bsz-bw.de> 2011-04-08 08:16:49 UTC ---
I have some merge conflicts while applying the first 'Initial patch':

Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Robust handling of deleted biblios/authorities
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging authorities/detail.pl
CONFLICT (content): Merge conflict in authorities/detail.pl
Auto-merging catalogue/detail.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
Failed to merge in the changes.
Patch failed at 0001 Robust handling of deleted biblios/authorities
When you have resolved this problem run "git am -i -3 --resolved".
If you would prefer to skip this patch, instead run "git am -i -3 --skip".
To restore the original branch and stop patching run "git am -i -3 --abort".
[katrin at wombat kohaclone  (oth_5791_nice_error|AM)]$git status

-- 
Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA Contact for the bug.


More information about the Koha-bugs mailing list