{"thread":{"id":"23932","subject":"Re: Ensimag students working on textconv for blame","startedAt":"2010-05-28T10:27:10Z","lastAt":"2010-05-28T23:55:53Z","messageCount":2,"participants":["Diane Gasselin","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"142494","messageId":"AANLkTinHLoYMgBawxmXpH5XSyJDb_743HEpfCmfqoRHu@mail.gmail.com","threadId":"23932","inReplyTo":"AANLkTimmR6yLLmCy_QvonjjgAp9F012DQb9TYCMiQ0yp@mail.gmail.com","subject":"Re: Ensimag students working on textconv for blame","fromName":"Diane Gasselin","fromEmail":"diane.gasselin@ensimag.imag.fr","sentAt":"2010-05-28T10:27:10Z","receivedAt":"2010-05-28T10:27:10Z","isPatch":false,"sender":{"key":"diane.gasselin@ensimag.imag.fr","avatar":null},"body":"Hi,\n\nAxel, Clément and I are french Ensimag students\n( http://ensimag.grenoble-inp.fr/ ) working for the community on the\noccasion of an end-of-year project (in equivalent of master 1).\nSo it is kind of a mini-google summer of code for us.\n\nWe are mentored by Matthieu Moy who introduced us in the thread:\nhttp://article.gmane.org/gmane.comp.version-control.git/147487/\n\nWe are currently working on a textconv support for git-blame.\nWe are getting to a first version that we will soon communicate.\n\nAfterwards, we thought about working on git-merge.\nActually, when having some local changes in some files\nthat would be overwritten by merge, git-merge aborts giving the\nfirst file for which there is a problem. If we commit or stash the\nchanges on this file and try again to merge, the second file for\nwhich there are some local changes will appear.\nWhat will we try to do is to provide to the user a list of all the files\nfor which there is a problem before aborting.\nDo you think it is a good idea?\n\nThank you all for your time.\n\nCheers,\nAxel, Clément and Diane\n"},{"id":"142509","messageId":"7v63277f92.fsf@alter.siamese.dyndns.org","threadId":"23932","inReplyTo":"AANLkTinHLoYMgBawxmXpH5XSyJDb_743HEpfCmfqoRHu@mail.gmail.com","subject":"Re: Ensimag students working on textconv for blame","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-05-28T23:55:53Z","receivedAt":"2010-05-28T23:55:53Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Diane Gasselin <diane.gasselin@ensimag.imag.fr> writes:\n\n> Afterwards, we thought about working on git-merge.\n> Actually, when having some local changes in some files\n> that would be overwritten by merge, git-merge aborts giving the\n> first file for which there is a problem.\n\nThat's a nice bite-sized problem to tackle.  Thanks (and thank you,\nMatthieu).\n"}]}