Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-12-03 Thread Ben Coman
kilon alios wrote: I dont disagree but when it comes to me making a tutorial about something then foremost I want to know exactly what I am talking about. So its pointless for me to talk about merges using filetree and gitfiletree unless I understand these specific topic inside out. I dont

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-12-03 Thread kilon alios
yes I am aware of git documentation thus I mention it in my video tutorial On Wed, Dec 3, 2014 at 2:26 PM, Ben Coman b...@openinworld.com wrote: kilon alios wrote: I dont disagree but when it comes to me making a tutorial about something then foremost I want to know exactly what I am talking

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-12-01 Thread Eliot Miranda
Hi Dale, On Sun, Nov 30, 2014 at 10:52 AM, Dale Henrichs dale.henri...@gemtalksystems.com wrote: Eliot, If we remove the meta data from the FileTree repo, then it will be necessary to use the `adopt` command to restore the proper version history before interchanging copying to an mcz repo

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-12-01 Thread Esteban Lorenzano
On 01 Dec 2014, at 19:11, Eliot Miranda eliot.mira...@gmail.com wrote: Hi Dale, On Sun, Nov 30, 2014 at 10:52 AM, Dale Henrichs dale.henri...@gemtalksystems.com mailto:dale.henri...@gemtalksystems.com wrote: Eliot, If we remove the meta data from the FileTree repo, then it will be

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-12-01 Thread Thierry Goubier
Le 01/12/2014 19:21, Esteban Lorenzano a écrit : On 01 Dec 2014, at 19:11, Eliot Miranda eliot.mira...@gmail.com mailto:eliot.mira...@gmail.com wrote: Hi Dale, On Sun, Nov 30, 2014 at 10:52 AM, Dale Henrichs dale.henri...@gemtalksystems.com mailto:dale.henri...@gemtalksystems.com wrote:

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-12-01 Thread Dale Henrichs
On Mon, Dec 1, 2014 at 10:39 AM, Thierry Goubier thierry.goub...@gmail.com wrote: Le 01/12/2014 19:21, Esteban Lorenzano a écrit : also, in a point (not now, but eventually)… we will need to drop something. The idea of keeping anything ad eternum just does not scales. But it's a good way

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-12-01 Thread Esteban Lorenzano
On 01 Dec 2014, at 20:25, Dale Henrichs dale.henri...@gemtalksystems.com wrote: On Mon, Dec 1, 2014 at 10:39 AM, Thierry Goubier thierry.goub...@gmail.com mailto:thierry.goub...@gmail.com wrote: Le 01/12/2014 19:21, Esteban Lorenzano a écrit : also, in a point (not now, but

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-12-01 Thread Thierry Goubier
Le 01/12/2014 20:25, Dale Henrichs a écrit : On Mon, Dec 1, 2014 at 10:39 AM, Thierry Goubier thierry.goub...@gmail.com mailto:thierry.goub...@gmail.com wrote: Le 01/12/2014 19:21, Esteban Lorenzano a écrit : also, in a point (not now, but eventually)… we will need to drop

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-12-01 Thread Esteban Lorenzano
On 01 Dec 2014, at 21:15, Thierry Goubier thierry.goub...@gmail.com wrote: Le 01/12/2014 20:25, Dale Henrichs a écrit : On Mon, Dec 1, 2014 at 10:39 AM, Thierry Goubier thierry.goub...@gmail.com mailto:thierry.goub...@gmail.com wrote: Le 01/12/2014 19:21, Esteban Lorenzano a écrit

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-12-01 Thread Thierry Goubier
Le 01/12/2014 21:04, Esteban Lorenzano a écrit : On 01 Dec 2014, at 20:25, Dale Henrichs dale.henri...@gemtalksystems.com mailto:dale.henri...@gemtalksystems.com wrote: On Mon, Dec 1, 2014 at 10:39 AM, Thierry Goubier thierry.goub...@gmail.com mailto:thierry.goub...@gmail.com wrote: Le

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-12-01 Thread Esteban Lorenzano
On 01 Dec 2014, at 21:48, Thierry Goubier thierry.goub...@gmail.com wrote: Le 01/12/2014 21:04, Esteban Lorenzano a écrit : On 01 Dec 2014, at 20:25, Dale Henrichs dale.henri...@gemtalksystems.com mailto:dale.henri...@gemtalksystems.com wrote: On Mon, Dec 1, 2014 at 10:39 AM,

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-12-01 Thread Thierry Goubier
Le 01/12/2014 21:53, Esteban Lorenzano a écrit : I’m also concerned about that (32bits only). But we are already working on a solution. (and libgit2 support is already there, thanks to Max). as I said… our problem (not yours, but ours) is that we need to keep pharo independent of installed

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-12-01 Thread Thierry Goubier
Le 01/12/2014 21:39, Esteban Lorenzano a écrit : the goal is to not needing to install git command line to use it (is a requirement: pharo needs to keep being as portable and independent as always) :) from my point of view, I’m quite happy with gitfiletree. I will just intend to make it work

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-11-30 Thread kilon alios
The important take-away from this is that when working with git and Smalltalk you must track the SHA that has been loaded into the image (the latest version of Metacello tracks this information in the project registry) and you must have in-image tool support for recognizing SHA skew. It's not

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-11-30 Thread Dale Henrichs
On Sun, Nov 30, 2014 at 4:19 AM, kilon alios kilon.al...@gmail.com wrote: The important take-away from this is that when working with git and Smalltalk you must track the SHA that has been loaded into the image (the latest version of Metacello tracks this information in the project registry)

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-11-30 Thread kilon alios
I dont disagree but when it comes to me making a tutorial about something then foremost I want to know exactly what I am talking about. So its pointless for me to talk about merges using filetree and gitfiletree unless I understand these specific topic inside out. I dont have a problem getting a

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-11-30 Thread Dale Henrichs
On Sun, Nov 30, 2014 at 7:51 AM, kilon alios kilon.al...@gmail.com wrote: So far all I knew that using git for binary files was a no go, doable but not recommended. Thus I found strange that filetree uses binary files. Well the files are text files, but because the text represents structured

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-11-30 Thread kilon alios
ok Dale thanks for the explanation it makes things much clearer right now. I am glad it works well for you that means it will work well for me too and thus I am now much less reluctant to recommend it. Will give it a try and make a nice tutorial about it , together with gitfiletree. On Sun, Nov

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-11-30 Thread Eliot Miranda
Hi Dale, On Nov 30, 2014, at 8:14 AM, Dale Henrichs dale.henri...@gemtalksystems.com wrote: On Sun, Nov 30, 2014 at 7:51 AM, kilon alios kilon.al...@gmail.com wrote: So far all I knew that using git for binary files was a no go, doable but not recommended. Thus I found strange that

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-11-30 Thread Dale Henrichs
Eliot, If we remove the meta data from the FileTree repo, then it will be necessary to use the `adopt` command to restore the proper version history before interchanging copying to an mcz repo or trying to merge with an mcz package ... `adopt` is not an ideal solution, which is exactly why I've

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-11-29 Thread kilon alios
my pleasure , I am considering also creating a tutorial for fork, branch, merge, merge conflicts, diffs and pull request which are a bit more deep git stuff. I will try to finish it this weekend. On Sat, Nov 29, 2014 at 9:46 AM, stepharo steph...@free.fr wrote: thanks I added it to pharo weekly

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-11-29 Thread Thierry Goubier
Le 29/11/2014 09:16, kilon alios a écrit : my pleasure , I am considering also creating a tutorial for fork, branch, merge, merge conflicts, diffs and pull request which are a bit more deep git stuff. I will try to finish it this weekend. Great! I didn't finish the Git chapter on that :( Took

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-11-29 Thread kilon alios
I took a look at gifiletree-Merge drive and from the installation instructions alone , it blew my mind. Is there a simpler way of doing this ? Because I will have to do a separate video tutorial on command line and then another one for git configuration and customisation, I dont see how to do this

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-11-29 Thread Thierry Goubier
Le 29/11/2014 11:34, kilon alios a écrit : I took a look at gifiletree-Merge drive and from the installation instructions alone , it blew my mind. Is there a simpler way of doing this ? Because I will have to do a separate video tutorial on command line and then another one for git

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-11-29 Thread p...@highoctane.be
Kilon, The merge driver is needed when you work with several people in a given repo and want to merge branches etc. Filetree metadata is a pain in the ass when merging and Thierry's tool solves that. If you do any complicated thing with branches you'll have to understand git cli tools anyway.

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-11-29 Thread p...@highoctane.be
I wonder how we could use tODE for remote Pharo dev too. The way Dale shows things is really compelling indeed. Phil Le 29 nov. 2014 11:54, Thierry Goubier thierry.goub...@gmail.com a écrit : Le 29/11/2014 11:34, kilon alios a écrit : I took a look at gifiletree-Merge drive and from the

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-11-29 Thread kilon alios
For a true 'doing something with it', you have to look into what Dale Henrichs has done with tODE. He is, as far as I could read, a long way up front us. no idea what tODE is doing, I have seen some demos but I have not understand it. Filetree metadata is a pain in the ass when merging and

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-11-29 Thread Thierry Goubier
Le 29/11/2014 13:15, kilon alios a écrit : For a true 'doing something with it', you have to look into what Dale Henrichs has done with tODE. He is, as far as I could read, a long way up front us. no idea what tODE is doing, I have seen some demos but I have not understand it. What I know is

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-11-29 Thread kilon alios
I recently did a merge between the pharo3.0 and the pharo4.0 branches of AltBrowser; if you are interested, you can have a look and try to reproduce it (by doing a checkout of the pharo4.0 branch to the commit id just before the merge and merging with pharo3.0 again. Doing it with and

Re: [Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-11-28 Thread stepharo
thanks I added it to pharo weekly http://pharoweekly.wordpress.com/2014/11/29/github-for-pharo-using-sourcetree-video-by-kilon-alios/ Le 27/11/14 21:46, kilon alios a écrit : Hello pharoers , at last , my video tutorial for those that are not familiar with git and github, has been uploaded to

[Pharo-dev] Video Tutorial - Github for Pharo using Sourcetree

2014-11-27 Thread kilon alios
Hello pharoers , at last , my video tutorial for those that are not familiar with git and github, has been uploaded to YouTube. I describe the very basics of the process and give you enough information to create a github repository, clone the online repository to your hard driver and use the hard