Skip to content

Instantly share code, notes, and snippets.

Avatar

Dale Henrichs dalehenrich

View GitHub Profile
@dalehenrich
dalehenrich / plan.md
Created Mar 9, 2012
Metacello project plan
View plan.md

##Phase 1 ###FileTree basic functionality ###Metacello basic Metacello scripting API functional

  • load projects on github and in local git repositories
  • load standard mcz configurations
@dalehenrich
dalehenrich / bootstrap.st
Created Mar 12, 2012
Bootstrapping FileTree support into Pharo image
View bootstrap.st
"Note that these instructions apply to Phase1 ... not yet alpha, so take care:)
Assuming Pharo 1.3"
"Bootstrap filetree code"
Gofer new
url: 'http://ss3.gemstone.com/ss/FileTree';
package: 'ConfigurationOfFileTree';
load.
((Smalltalk at: #ConfigurationOfFileTree) project version: '1.0') load.
View MCFileTreeJsonParser.st
'From Pharo1.3 of 16 June 2011 [Latest update: #13315] on 23 March 2012 at 9:24:50 am'!
Object subclass: #MCFileTreeJsonParser
instanceVariableNames: 'stream'
classVariableNames: ''
poolDictionaries: ''
category: 'MonticelloFileTree-Core'!
!MCFileTreeJsonParser methodsFor: 'adding' stamp: 'dkh 3/1/2012 16:36:43'!
addProperty: anAssociation to: anObject
"Add the property anAssociation described with key and value to anObject. Subclasses might want to refine this implementation."
@dalehenrich
dalehenrich / import.st
Created Apr 29, 2012
Amber import Ston-Core package
View import.st
CypressAmberImporter
importCypressPackages: #('Ston-Core')
prefix:'projects/ston/repository/'.
CypressAmberImporter
importCypressPackages: #('Ston-Tests')
prefix:'projects/ston/repository/'
@dalehenrich
dalehenrich / mergeAndPreserve.md
Created Apr 30, 2012
merge and preserve branches from a forked repository
View mergeAndPreserve.md

Basic procedure gleaned from [Git: Merging from Remote Branch][1].

  1. Start with a clone of the repository into which you want to merge the branched:
git clone https://github.com/svenvc/ston.git
*Note: you'll probably want to use a writable version of the repository url. Also at any time you can destroy the clone and start over ... of course you will lose work, but if you think that there's something wrong destroy the repository before pushing a mistake up to github ... github is the repository of record.*
  1. Add a remote reference to the repository from which you want to merge:
@dalehenrich
dalehenrich / addRepos.st
Created May 2, 2012
Add a bunch of FileTree repos
View addRepos.st
#('master' 'gemstone' 'pharo' 'pharo1.2.x' 'squeak' 'squeakCommon') do: [:name | | repo |
repo := (MCFileTreeRepository new directory:
(FileDirectory on: '/opt/git/experiment/', name, '/metacello/repository/')).
MCRepositoryGroup default addRepository: repo ].
View gitMergeTool.md

[source...][1].

ubuntu:

git config --global merge.tool diffmerge
git config --global mergetool.diffmerge.cmd "/usr/bin/diffmerge --merge --result=\$MERGED \$LOCAL \$BASE \$REMOTE"
git config --global mergetool.keepBackup false

mac: