[Koha-bugs] [Bug 4530] Circulation & fines rules aren't always applied from most specific to less specific

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

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

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

           What    |Removed                     |Added
----------------------------------------------------------------------------
       Patch Status|Needs Signoff               |Does not apply

--- Comment #12 from Katrin Fischer <katrin.fischer at bsz-bw.de> 2011-12-21 20:25:49 UTC ---
Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: bug_4530: Rework issuing rules
/home/katrin/kohaclone/.git/rebase-apply/patch:150: trailing whitespace.

/home/katrin/kohaclone/.git/rebase-apply/patch:314: trailing whitespace.
                   FROM issues 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
<stdin>:150: trailing whitespace.

<stdin>:314: trailing whitespace.
                   FROM issues 
warning: 2 lines applied after fixing whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging C4/Circulation.pm
CONFLICT (content): Merge conflict in C4/Circulation.pm
Auto-merging C4/Members.pm
Auto-merging C4/Overdues.pm
Auto-merging C4/Reserves.pm
Failed to merge in the changes.
Patch failed at 0001 bug_4530: Rework issuing rules
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

-- 
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.
You are watching all bug changes.