[Pharo-dev] Support understanding changes

Goubier Thierry thierry.goubier at cea.fr
Wed Nov 6 08:51:09 EST 2013



Le 06/11/2013 14:33, Camillo Bruni a écrit :
>
>>> Indeed, some meta data is needed, although I think much of it can be properly inferred if the commits have sufficient resolution. As a side note, git for instance does not track renames:
>>> 	https://git.wiki.kernel.org/index.php/Git_FAQ#Why_does_Git_not_.22track.22_renames.3F
>>> 	http://permalink.gmane.org/gmane.comp.version-control.git/217
>>> Specially the last link is worth reading ;)
>>
>> Yes, this seems probable, but we need to try to be sure.
>
> definitely, for now this sounds more like an optimization, sticking to the full metadata seems to be easier.
>
>
>>> If you attach the information to the commit itself that will be fine: 	
>>> 	https://www.kernel.org/pub/software/scm/git/docs/git-notes.html
>>>
>>> because, as you say, each time metadata ends up in the sources part of the git
>>> repository we will have merge problems, since you can only properly merge such
>>> data if you fully understand the semantic meaning.
>>
>> Hum. Reading git notes say that there is a merge operation involved...
>
> haha, yeah thought the same ;), though I never used notes, so I have to try that out first..

Yes, there is also a notes rewrite if rebase or amend :(

I'll go to the sprint on 19/12; maybe we can look into what we have on 
that: new format / metadata / EPICEA-readiness.

If anybody has a pointer on a log format suitable for git merging, I'm a 
taker :)

Thierry
-- 
Thierry Goubier
CEA list
Laboratoire des Fondations des Systèmes Temps Réel Embarqués
91191 Gif sur Yvette Cedex
France
Phone/Fax: +33 (0) 1 69 08 32 92 / 83 95




More information about the Pharo-dev mailing list