[Koha-patches] [PATCH] Analytical Records - Adding display of item information in catalog search results

[Chris Cormack]

For something big like this, a pull request for a branch is probably the easiest and least error prone way to do it.

Thanks

Chris

savitra sirohi <savitra.sirohi at osslabs.biz> wrote:

>Hi Chris, we needed to send fresh patches in any case as we are
>redoing the feature in a different way.
>
>Process question - should we send incremental patches or should we
>send patches formatted against the latest master. I am guessing you
>see this error because you had not apply the earlier patch Amit had
>sent.
>
>Thanks,
>Savitra
>
>2010/10/28 Chris Cormack <chrisc at catalyst.net.nz>:
>> Hi Amit
>>
>> Unfortunately this patch does not apply
>>
>> Applying: Analytical Records - Adding display of item information in
>> catalog search results
>> fatal: sha1 information is lacking or useless (C4/Items.pm).
>> Repository lacks necessary blobs to fall back on 3-way merge.
>> Cannot fall back to three-way merge.
>> Patch failed at 0001 Analytical Records - Adding display of item
>> information in catalog search results
>>
>> Can you try rebasing it and send again
>>
>> Chris
>> --
>> Chris Cormack
>> Catalyst IT Ltd.
>> +64 4 803 2238
>> PO Box 11-053, Manners St, Wellington 6142, New Zealand
>>
>> -----BEGIN PGP SIGNATURE-----
>> Version: GnuPG v1.4.10 (GNU/Linux)
>>
>> iEYEARECAAYFAkzIqM4ACgkQZgbcHEvgMLPF9wCeMetuUYVXpSM0+3hYxRoZ8zCd
>> loMAn0WI1n+9zr5IQLIXzF7LX5AuvpJS
>> =83M0
>> -----END PGP SIGNATURE-----
>>
>> _______________________________________________
>> Koha-patches mailing list
>> Koha-patches at lists.koha-community.org
>> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
>>