Re: [Pharo-users] Having a look at Git+Pharo

2015-09-11 Thread Thierry Goubier
2015-09-11 15:47 GMT+02:00 Alexandre Bergel : > But this add a serious indirection layer. In Java, since there is no > image, doing a pull update your code. In Pharo, it would simply update the > git repo, without updating the code in your image. What’s happens if I > modify the code in my image a

Re: [Pharo-users] Having a look at Git+Pharo

2015-09-11 Thread Thierry Goubier
2015-09-11 15:45 GMT+02:00 Alexandre Bergel : > But making sure that people for a given project can commit either to a git > repo to a smalltalkhub significantly complexify the thing. And at the end, > we will always have people who stay in smalltalkhub because it is much > simpler than git. > Of

Re: [Pharo-users] Having a look at Git+Pharo

2015-09-11 Thread Alexandre Bergel
But this add a serious indirection layer. In Java, since there is no image, doing a pull update your code. In Pharo, it would simply update the git repo, without updating the code in your image. What’s happens if I modify the code in my image and do a git pull? I will have conflict between my im

Re: [Pharo-users] Having a look at Git+Pharo

2015-09-11 Thread Alexandre Bergel
But making sure that people for a given project can commit either to a git repo to a smalltalkhub significantly complexify the thing. And at the end, we will always have people who stay in smalltalkhub because it is much simpler than git. Several times I wanted to migrate to git, but the burde

Re: [Pharo-users] Having a look at Git+Pharo

2015-09-11 Thread Thierry Goubier
Le 11 septembre 2015 15:33, Alexandre Bergel a écrit : > [ answer in the mailing list since it may interest other ] > > Another problem would be the synchronization between the image and the > source code stored on disk. For example, I should never do a git pull > within a xterm command, because

Re: [Pharo-users] Having a look at Git+Pharo

2015-09-11 Thread Thierry Goubier
2015-09-11 15:28 GMT+02:00 Alexandre Bergel : > > >> 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 >

Re: [Pharo-users] Having a look at Git+Pharo

2015-09-11 Thread Alexandre Bergel
[ answer in the mailing list since it may interest other ] Another problem would be the synchronization between the image and the source code stored on disk. For example, I should never do a git pull within a xterm command, because the image will not be sync. Alexandre > On Sep 11, 2015, at

Re: [Pharo-users] Having a look at Git+Pharo

2015-09-11 Thread Alexandre Bergel
>> 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. More I thi

Re: [Pharo-users] Having a look at Git+Pharo

2015-09-10 Thread Thierry Goubier
Le 11/09/2015 06:56, Damien Cassou a écrit : Thierry Goubier writes: 2015-09-09 16:29 GMT+02:00 Damien Cassou : something else I forgot: - what happens if a Metacello description loads a project hosted in git but I still want to be able to hack on this dependency. So, this dependenc

Re: [Pharo-users] Having a look at Git+Pharo

2015-09-10 Thread Damien Cassou
Thierry Goubier writes: > 2015-09-09 16:29 GMT+02:00 Damien Cassou : > >> >> something else I forgot: >> >> - what happens if a Metacello description loads a project hosted in git >> but I still want to be able to hack on this dependency. So, this >> dependency should not be read-only for me

Re: [Pharo-users] Having a look at Git+Pharo

2015-09-10 Thread Thierry Goubier
Le 11/09/2015 01:52, Alexandre Bergel a écrit : Hi! I am confused. What is said on https://ci.inria.fr/pharo-contribution/view/Books/job/PharoBookWorkInProgress/lastSuccessfulBuild/artifact/book-result/GitAndPharo/GitAndPharo.html is different than what I can read on https://github.com/Thierry

Re: [Pharo-users] Having a look at Git+Pharo

2015-09-10 Thread Alexandre Bergel
Hi! I am confused. What is said on https://ci.inria.fr/pharo-contribution/view/Books/job/PharoBookWorkInProgress/lastSuccessfulBuild/artifact/book-result/GitAndPharo/GitAndPharo.html is different than what I can read on https://github.com/ThierryGoubier/GitFileTree-MergeDriver Do I need to mo

Re: [Pharo-users] Having a look at Git+Pharo

2015-09-10 Thread Thierry Goubier
Le 10/09/2015 20:29, Alexandre Bergel a écrit : But, all well considered, relying only on the underlying vcs for versions, but writing chunk files, could it work? With the gitfiletree framework, all version / meta information is external to the source files, so Metacello could use that and have e

Re: [Pharo-users] Having a look at Git+Pharo

2015-09-10 Thread Alexandre Bergel
>>> But, all well considered, relying only on the underlying vcs for >>> versions, but writing chunk files, could it work? With the >>> gitfiletree framework, all version / meta information is external >>> to the source files, so Metacello could use that and have >>> everything it needs. Would some

Re: [Pharo-users] Having a look at Git+Pharo

2015-09-10 Thread Thierry Goubier
Le 10/09/2015 19:37, Alexandre Bergel a écrit : Solving MC conflicts with tools like meld isn't fun. When it is for Metacello version files, it's allmost impossible to correct properly. I do not see why. It works well for other languages, I see no reason why it would not work in Pharo. That's

Re: [Pharo-users] Having a look at Git+Pharo

2015-09-10 Thread Alexandre Bergel
> Solving MC conflicts with tools like meld isn't fun. When it is for Metacello > version files, it's allmost impossible to correct properly. I do not see why. It works well for other languages, I see no reason why it would not work in Pharo. > >> One question I have: is mcz the most appropria

Re: [Pharo-users] Having a look at Git+Pharo

2015-09-10 Thread Thierry Goubier
Hi Alexandre, Le 10/09/2015 17:40, Alexandre Bergel a écrit : Hi! I am not sure to understand. There is a fair amount of tools for got to deal with conflict. Sure, we could imagine compelling scenarios to have the conflict merger in Pharo. But I do not feel this is that necessary for now. Sol

Re: [Pharo-users] Having a look at Git+Pharo

2015-09-10 Thread Alexandre Bergel
Hi! I am not sure to understand. There is a fair amount of tools for got to deal with conflict. Sure, we could imagine compelling scenarios to have the conflict merger in Pharo. But I do not feel this is that necessary for now. One question I have: is mcz the most appropriate? Why not simply

Re: [Pharo-users] Having a look at Git+Pharo

2015-09-09 Thread Thierry Goubier
2015-09-09 16:43 GMT+02:00 Peter Uhnák : > - a discussion about moving a smalltalkhub repository to git while >> preserving history > > > I've migrated some time ago > > http://forum.world.st/moving-to-git-and-preserving-monticello-history-td4806386.html > > some (if not all) of the issues w

Re: [Pharo-users] Having a look at Git+Pharo

2015-09-09 Thread Peter Uhnák
> > - a discussion about moving a smalltalkhub repository to git while > preserving history I've migrated some time ago http://forum.world.st/moving-to-git-and-preserving-monticello-history-td4806386.html some (if not all) of the issues were resolved iirc, however since I didn't need to mi

Re: [Pharo-users] Having a look at Git+Pharo

2015-09-09 Thread Thierry Goubier
2015-09-09 16:04 GMT+02:00 Damien Cassou : > 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-contribu

Re: [Pharo-users] Having a look at Git+Pharo

2015-09-09 Thread Thierry Goubier
2015-09-09 16:29 GMT+02:00 Damien Cassou : > > something else I forgot: > > - what happens if a Metacello description loads a project hosted in git > but I still want to be able to hack on this dependency. So, this > dependency should not be read-only for me > Can you give an example? > > -

Re: [Pharo-users] Having a look at Git+Pharo

2015-09-09 Thread Damien Cassou
something else I forgot: - what happens if a Metacello description loads a project hosted in git but I still want to be able to hack on this dependency. So, this dependency should not be read-only for me - where to put the git repositories when images are frequently deleted and downloaded

[Pharo-users] Having a look at Git+Pharo

2015-09-09 Thread Damien Cassou
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/lastSuccessfu