git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Ensimag students working on textconv for blame

From
DGDiane Gasselin <diane.gasselin@ensimag.imag.fr>
Date
May 28, 2010, 10:27 UTC
Message-ID
<AANLkTinHLoYMgBawxmXpH5XSyJDb_743HEpfCmfqoRHu@mail.gmail.com>
In-Reply-To
<AANLkTimmR6yLLmCy_QvonjjgAp9F012DQb9TYCMiQ0yp@mail.gmail.com>
Hi,

Axel, Clément and I are french Ensimag students ( http://ensimag.grenoble-inp.fr/ ) working for the community on the occasion of an end-of-year project (in equivalent of master 1). So it is kind of a mini-google summer of code for us.

We are mentored by Matthieu Moy who introduced us in the thread: http://article.gmane.org/gmane.comp.version-control.git/147487/

We are currently working on a textconv support for git-blame. We are getting to a first version that we will soon communicate.

Afterwards, we thought about working on git-merge. Actually, when having some local changes in some files that would be overwritten by merge, git-merge aborts giving the first file for which there is a problem. If we commit or stash the changes on this file and try again to merge, the second file for which there are some local changes will appear. What will we try to do is to provide to the user a list of all the files for which there is a problem before aborting. Do you think it is a good idea?

Thank you all for your time.

Cheers, Axel, Clément and Diane

Next: Junio C Hamano
Message 1 of 2 in “Re: Ensimag students working on textconv for blame”
  1. Diane GasselinMay 28, 2010
  2. Junio C HamanoMay 28, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.