http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7412
--- Comment #5 from Nicole C. Engard <neng...@gmail.com> 2012-01-06 14:58:31
UTC ---
I just did a fetch on master and tried again and still it's not applying - are
you on the latest master as of this minute?
nengard@debian:~/kohaclone$ git bz apply 7412
Bug 7412 - Pre-filling items in cataloguing
proposed patch
Apply? [yn] y
Applying: Bug 7412: Pre-filling items in cataloguing
/home/nengard/kohaclone/.git/rebase-apply/patch:85: trailing whitespace.
# force the use of "add and duplicate" feature, so the form will be filled
with
/home/nengard/kohaclone/.git/rebase-apply/patch:176: trailing whitespace.
$itemrecord = $cookieitemrecord if ($prefillitem and not $justaddeditem and $op
ne "edititem");
error: patch failed: kohaversion.pl:16
error: kohaversion.pl: patch does not apply
Patch failed at 0001 Bug 7412: Pre-filling items in cataloguing
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".
Patch left in /tmp/proposed-patch-jUts5f.patch
nengard@debian:~/kohaclone$
--
Configure bugmail:
http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/
