http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6434
Serhij Dubyk <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Priority|PATCH-Sent |P5 Patch Status|Failed QA |--- --- Comment #4 from Serhij Dubyk <[email protected]> 2011-06-01 07:38:35 UTC --- (In reply to comment #3) > Your patch doesn't apply on HEAD. > > INSERT INTO authorised_values (category, authorised_value, lib) VALUES > error: patch failed: > installer/data/mysql/ru-RU/optional/patron_atributes.sql:1 > error: installer/data/mysql/ru-RU/optional/patron_atributes.sql: patch does > not > apply > error: patch failed: > installer/data/mysql/uk-UA/optional/patron_atributes.sql:1 > error: installer/data/mysql/uk-UA/optional/patron_atributes.sql: patch does > not > apply > Did you hand edit your patch? > It does not apply to blobs recorded in its index. > Cannot fall back to three-way merge. I not manually edited the patch. I do not understand why there is an error with these files - they are quite simple (look https://www.dropbox.com/s/f07d6nidu39mvdj/uk-UA/optional/patron_atributes.sql and https://www.dropbox.com/s/f07d6nidu39mvdj/ru-RU/optional/patron_atributes.sql). Could something be wrong when I work with GIT..? My steps: 1) git clone git://git.koha-community.org/koha.git kohaclone 2) cd kohaclone git checkout -b dubyk_master origin/master 3) delete kohaclone/installer/data/mysql/uk-UA/ and kohaclone/installer/data/mysql/ru-RU/ 4) Copy my above updated folders uk-UA and ru-RU to kohaclone/installer/data/mysql/ 5) git commit -a 6) git format-patch -s --subject-prefix='PATCH] [SIGNED-OFF' origin/master 7) In result I have file: kohaclone/0001-Many-changes-for-Ukrainian-and-Russian-sql.patch which I tried to send (git send-email -to [email protected] ...) and attached here. Folders uk-UA/, ru-RU/ and related archives I posted also in Dropbox - https://www.dropbox.com/s/f07d6nidu39mvdj#view:list -- 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. _______________________________________________ Koha-bugs mailing list [email protected] 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/
