[Glass] Updating Zinc for Gemstone

[Dale K. Henrichs]

Note that in the glass_exp branch I was moving the extension methods needed into the GLASS1 project[1]

Dale

[1] https://github.com/glassdb/glass

----- Original Message -----
| From: "Dale K. Henrichs" <dale.henrichs at gemtalksystems.com>
| To: "Johan Brichau" <johan at yesplan.be>
| Cc: glass at lists.gemtalksystems.com
| Sent: Sunday, November 17, 2013 10:35:00 AM
| Subject: Re: [Glass] Updating Zinc for Gemstone
| 
| Oh wait ...that was my ston work ... too many different projects ..
| 
| Yes, it does look like the 2.4.3 stuff was not merged into
| gemstone2.4 branch nor the gemstone3.1 branch ...
| 
| I don't think we need to tag the gemstone-specific changes, because
| git handles that for us ... by pulling svens code onto our master
| branch and then doing platform specific branches git will manage the
| methods that we've changed for the port ... if we want to publish
| bugfixes back to sven, then we cherry pick into a topic branch off
| of the master branch and then do a pull request against sven's repo
| ... when he merges the pull request, we can pull from his master to
| pick up the changes, then we merge from our master into the
| gemstone2.4 and gemstone3.1 branches ...
| 
| Could you point to me to some examples of "Method conflicts are
| showing up where no conflict exists" I just went through a major
| reshuffling of code with ston, so I might have seen something like
| this already ...
| 
| Dale
| 
| ----- Original Message -----
| | From: "Dale K. Henrichs" <dale.henrichs at gemtalksystems.com>
| | To: "Johan Brichau" <johan at yesplan.be>
| | Cc: glass at lists.gemtalksystems.com
| | Sent: Sunday, November 17, 2013 10:20:30 AM
| | Subject: Re: [Glass] Updating Zinc for Gemstone
| | 
| | Johan,
| | 
| | I thought everything was merged in a in good shape .... but let me
| | double check...
| | 
| | Dale
| | 
| | ----- Original Message -----
| | | From: "Johan Brichau" <johan at yesplan.be>
| | | To: glass at lists.gemtalksystems.com
| | | Sent: Sunday, November 17, 2013 8:42:57 AM
| | | Subject: [Glass] Updating Zinc for Gemstone
| | | 
| | | Dale,
| | | 
| | | While I am getting my hands back onto Zinc, I noticed you pulled
| | | in
| | | Zinc 2.4.3 in the master branch on glassdb/zinc but never merged
| | | this with the gemstone branches, right?
| | | Just asking the question, since I am then busy doing just that.
| | | 
| | | btw, we might need a way to tag/comment where gemstone-specific
| | | changes were made. Syncing latest changes from Pharo is a pain…
| | | Method conflicts are showing up where no conflict exists and I am
| | | puzzled if I am loosing changes of the port or if it’s just
| | | noise.
| | | 
| | | Johan
| | | _______________________________________________
| | | Glass mailing list
| | | Glass at lists.gemtalksystems.com
| | | http://lists.gemtalksystems.com/mailman/listinfo/glass
| | | 
| | 
|