2015-09-11 15:28 GMT+02:00 Alexandre Bergel <alexandre.ber...@me.com>:
> > >> Do I need to modify .gitattributes and .gitconfig? > > > > Just the .gitattributes. The .gitconfig stuff will be taken care of when > the merge driver is installed. > > Ok, but why do we need this ? What I understand is to merge conflicts with > metadata of .mcz, which are useless in Git. > Yes and no. They are useless in an ideal world where everybody is using git or an equivalent (fossil, hg, svn). But they are very usefull now to get non-git users to keep using the packages (the tandem filetree/gitfiletree). > More I think about it, more I think that we need to go toward a lighter > version of .mcz file, without the meta-data. > I agree on the target, but. git support on windows is not there yet, and any format without metadata would be Linux and Mac only at the moment. I do believe that external commands on Windows is/should be a priority, but I can only wish for it. libcgit would also solve the problem of git support (but would restrict it to git only). Thierry > > Alexandre > > > > > > > Thierry > > > >> > >> Alexandre > >> > >>> On Sep 9, 2015, at 11:04 AM, Damien Cassou <damien.cas...@inria.fr> > wrote: > >>> > >>> Hi, > >>> > >>> today I wanted to have a look at how git integrates with Pharo. This is > >>> what I found (mostly done by Thierry Goubier, thank you very much) and > >>> what I didn't find: > >>> > >>> - there is some documentation here: > >>> > https://ci.inria.fr/pharo-contribution/view/Books/job/PharoBookWorkInProgress/lastSuccessfulBuild/artifact/book-result/GitAndPharo/GitAndPharo.html > >>> But this is largely unfinished material. I contributed by adding a few > >>> things here and there but not much. If you have some experience, > >>> please share it there > >>> (https://github.com/SquareBracketAssociates/PharoInProgress). Missing > >>> things include: > >>> > >>> - a discussion about which process to follow in which conditions > >>> (should I use GitFileTree or FileTree?) > >>> > >>> - a discussion about moving a smalltalkhub repository to git while > >>> preserving history > >>> > >>> - a discussion on how to write Metacello configurations for a project > >>> on git and for a project which depends on a project on git. > >>> > >>> - there is a nice git merge driver > >>> (https://github.com/ThierryGoubier/GitFileTree-MergeDriver). It seems > >>> to work fine. I sent 3 minor pull requests. > >>> > >>> - a list of tools missing before everyone uses git. For example: > >>> > >>> - A tool to resolve merge conflicts in Pharo. We should reuse the diff > >>> widget we have. > >>> > >>> -- > >>> Damien Cassou > >>> http://damiencassou.seasidehosting.st > >>> > >>> "Success is the ability to go from one failure to another without > >>> losing enthusiasm." --Winston Churchill > >>> > >> > > > > > > -- > _,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;: > Alexandre Bergel http://www.bergel.eu > ^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;. > > > > >
