[Koha-bugs] [Bug 7001] User Configurable Slips

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

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

--- Comment #52 from Liz Rea <wizzyrea at gmail.com> 2012-01-24 15:35:43 UTC ---
You were right - sorry about that! 

http://screencast.com/t/eOkFc10Euae

I know that when I tried it yesterday it applied ok, but clearly something was
amiss - today when I redid it on a fresh fetch I got the following: 


Applying: bug_7001: Issue and Reserve slips are notices.
/home/liz/kohaclone/.git/rebase-apply/patch:410: trailing whitespace.
    }    
/home/liz/kohaclone/.git/rebase-apply/patch:411: trailing whitespace.
   # send an "account details" notice to a newly created user 
/home/liz/kohaclone/.git/rebase-apply/patch:647: trailing whitespace.

/home/liz/kohaclone/.git/rebase-apply/patch:1010: trailing whitespace.
ITEM RESERVED: 
/home/liz/kohaclone/.git/rebase-apply/patch:2124: trailing whitespace.
    [% UNLESS independant_branch %]        
warning: squelched 4 whitespace errors
warning: 9 lines add whitespace errors.
Using index info to reconstruct a base tree...
<stdin>:410: trailing whitespace.
    }    
<stdin>:411: trailing whitespace.
   # send an "account details" notice to a newly created user 
<stdin>:647: trailing whitespace.

<stdin>:1010: trailing whitespace.
ITEM RESERVED: 
<stdin>:2124: trailing whitespace.
    [% UNLESS independant_branch %]        
warning: squelched 6 whitespace errors
warning: 9 lines applied after fixing whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging installer/data/mysql/sysprefs.sql
CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Removing koha-tmpl/intranet-tmpl/prog/en/modules/circ/hold-transfer-slip.tt
Removing koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
Failed to merge in the changes.
Patch failed at 0001 bug_7001: Issue and Reserve slips are notices.


However, those things were easily resolved so I went ahead and did so - I have
the commits, do you want them so you can squash them in or... what's your
preferred course of action here?

-- 
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.