http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7439 Jared Camins-Esakov <jcamins@cpbibliography.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Priority|P5 - low |PATCH-Sent Patch Status|--- |Needs Signoff AssignedTo|gmcharlt@gmail.com |cnighswonger@foundations.ed | |u -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7439 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #7113|0 |1 is obsolete| | --- Comment #3 from Chris Cormack <chris@bigballofwax.co.nz> 2012-01-13 03:52:55 UTC --- Created attachment 7118 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=7118 [Rel 3.6.x] Bug 7439: Add mailmap for jcamins Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7439 --- Comment #5 from M. de Rooy <m.de.rooy@rijksmuseum.nl> 2012-01-13 11:44:06 UTC --- Why don't we use .mailmap in master? Suppose that you would like to see the same shortlog output in master too.. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7439 --- Comment #6 from M. de Rooy <m.de.rooy@rijksmuseum.nl> 2012-01-13 13:47:32 UTC --- Created attachment 7136 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=7136 [UNSIGNED] Follow up for marcel@libdevelop -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7439 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Patch doesn't apply CC| |paul.poulain@biblibre.com --- Comment #7 from Paul Poulain <paul.poulain@biblibre.com> 2012-01-16 14:39:00 UTC --- mmm... am I doing something wrong, the patch does not apply for me, I get: [PASSED_QA][Rel 3.6.x] Bug 7439: Add mailmap for jcamins Apply? [yn] y Applying: Bug 7439: Add mailmap for jcamins Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... error: refusing to lose untracked file at '.mailmap' CONFLICT (delete/modify): .mailmap deleted in HEAD and modified in Bug 7439: Add mailmap for jcamins. Version Bug 7439: Add mailmap for jcamins of .mailmap left in tree. Failed to merge in the changes. Patch failed at 0001 Bug 7439: Add mailmap for jcamins 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". .mailmap is not tracked by git (but exist... how can this happend ? -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7439 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Signed Off --- Comment #9 from Paul Poulain <paul.poulain@biblibre.com> 2012-01-16 17:35:52 UTC --- (In reply to comment #8)

Sure that you are on 3.6.X ?

jcamins answered on IRC. No I wasn't, and totally missed the mail from chris_n about this file (dec, 4th) on koha-devel -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7439 --- Comment #10 from M. de Rooy <m.de.rooy@rijksmuseum.nl> 2012-01-18 13:57:40 UTC --- Created attachment 7217 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=7217 [UNSIGNED] [MASTER] Add mailmap to master Adding .mailmap to master. File from 3.6.X after applying the latest two 3.6.X patches. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7439 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #7118|0 |1 is obsolete| | -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7439 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|Mailmap for 3.6.x not |Mailmap for git shortlog |complete | -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7439 Jared Camins-Esakov <jcamins@cpbibliography.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7439 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7439 Jared Camins-Esakov <jcamins@cpbibliography.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to Master |RESOLVED Resolution|--- |FIXED --- Comment #13 from Jared Camins-Esakov <jcamins@cpbibliography.com> --- The mailmap is available on the Master branch. -- You are receiving this mail because: You are watching all bug changes.